Moving 1.x branches

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

4273 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-android/demos/pom.xml b/sca-java-1.x/branches/sca-android/demos/pom.xml
index e716ddb987..e716ddb987 100644
--- a/branches/sca-android/demos/pom.xml
+++ b/sca-java-1.x/branches/sca-android/demos/pom.xml
diff --git a/branches/sca-android/distribution/features/core/pom.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/pom.xml
index f96bd7c430..f96bd7c430 100644
--- a/branches/sca-android/distribution/features/core/pom.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/pom.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/assembly/bin.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/assembly/bin.xml
index 200cc91080..200cc91080 100644
--- a/branches/sca-android/distribution/features/core/src/main/assembly/bin.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/assembly/bin.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/assembly/src.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/assembly/src.xml
index 6fe3e2dae1..6fe3e2dae1 100644
--- a/branches/sca-android/distribution/features/core/src/main/assembly/src.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/assembly/src.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/components/bin-common.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/bin-common.xml
index c69e8e3699..c69e8e3699 100644
--- a/branches/sca-android/distribution/features/core/src/main/components/bin-common.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/bin-common.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/components/bin-dependencies.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/bin-dependencies.xml
index a1bde3932b..a1bde3932b 100644
--- a/branches/sca-android/distribution/features/core/src/main/components/bin-dependencies.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/bin-dependencies.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
index d009672310..d009672310 100644
--- a/branches/sca-android/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/components/bin-samples.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/bin-samples.xml
index fbe46a296c..fbe46a296c 100644
--- a/branches/sca-android/distribution/features/core/src/main/components/bin-samples.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/bin-samples.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/components/src-common.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/src-common.xml
index 002df33fc7..002df33fc7 100644
--- a/branches/sca-android/distribution/features/core/src/main/components/src-common.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/src-common.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/components/src-modules.xml b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/src-modules.xml
index 5b12e0b784..5b12e0b784 100644
--- a/branches/sca-android/distribution/features/core/src/main/components/src-modules.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/components/src-modules.xml
diff --git a/branches/sca-android/distribution/features/core/src/main/release/CHANGES b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/CHANGES
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/CHANGES
diff --git a/branches/sca-android/distribution/features/core/src/main/release/DISCLAIMER b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/DISCLAIMER
diff --git a/branches/sca-android/distribution/features/core/src/main/release/README b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/README
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/README
diff --git a/branches/sca-android/distribution/features/core/src/main/release/RELEASE_NOTES b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-android/distribution/features/core/src/main/release/bin/INSTALL b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/bin/INSTALL
diff --git a/branches/sca-android/distribution/features/core/src/main/release/bin/LICENSE b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/bin/LICENSE
diff --git a/branches/sca-android/distribution/features/core/src/main/release/bin/NOTICE b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/bin/NOTICE
diff --git a/branches/sca-android/distribution/features/core/src/main/release/src/BUILDING b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/src/BUILDING
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/src/BUILDING
diff --git a/branches/sca-android/distribution/features/core/src/main/release/src/LICENSE b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/src/LICENSE
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/src/LICENSE
diff --git a/branches/sca-android/distribution/features/core/src/main/release/src/NOTICE b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-android/distribution/features/core/src/main/release/src/NOTICE
+++ b/sca-java-1.x/branches/sca-android/distribution/features/core/src/main/release/src/NOTICE
diff --git a/branches/sca-android/distribution/features/etc/generate-all-maven-files.sh b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-all-maven-files.sh
index 5f321004b8..5f321004b8 100755
--- a/branches/sca-android/distribution/features/etc/generate-all-maven-files.sh
+++ b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-all-maven-files.sh
diff --git a/branches/sca-android/distribution/features/etc/generate-filtered-dependencies.sh b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-filtered-dependencies.sh
index 7a04369b50..7a04369b50 100755
--- a/branches/sca-android/distribution/features/etc/generate-filtered-dependencies.sh
+++ b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-filtered-dependencies.sh
diff --git a/branches/sca-android/distribution/features/etc/generate-maven-files.sh b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-maven-files.sh
index adb190eabd..adb190eabd 100755
--- a/branches/sca-android/distribution/features/etc/generate-maven-files.sh
+++ b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-maven-files.sh
diff --git a/branches/sca-android/distribution/features/etc/generate-pom.sh b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-pom.sh
index ce0228694c..ce0228694c 100755
--- a/branches/sca-android/distribution/features/etc/generate-pom.sh
+++ b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-pom.sh
diff --git a/branches/sca-android/distribution/features/etc/generate-src-modules.sh b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-src-modules.sh
index 60dbbcd2d0..60dbbcd2d0 100755
--- a/branches/sca-android/distribution/features/etc/generate-src-modules.sh
+++ b/sca-java-1.x/branches/sca-android/distribution/features/etc/generate-src-modules.sh
diff --git a/branches/sca-android/distribution/features/pom.xml b/sca-java-1.x/branches/sca-android/distribution/features/pom.xml
index 6f7dc519cd..6f7dc519cd 100644
--- a/branches/sca-android/distribution/features/pom.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/pom.xml
diff --git a/branches/sca-android/distribution/features/repository/pom.xml b/sca-java-1.x/branches/sca-android/distribution/features/repository/pom.xml
index 2c1e30c82d..2c1e30c82d 100644
--- a/branches/sca-android/distribution/features/repository/pom.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/pom.xml
diff --git a/branches/sca-android/distribution/features/repository/src/main/assembly/repository.xml b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/assembly/repository.xml
index ed459500a8..ed459500a8 100644
--- a/branches/sca-android/distribution/features/repository/src/main/assembly/repository.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/assembly/repository.xml
diff --git a/branches/sca-android/distribution/features/repository/src/main/components/src-modules.xml b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/components/src-modules.xml
index cef542b41c..cef542b41c 100644
--- a/branches/sca-android/distribution/features/repository/src/main/components/src-modules.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/components/src-modules.xml
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/CHANGES b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/CHANGES
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/CHANGES
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/DISCLAIMER b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/DISCLAIMER
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/README b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/README
index 4d83dcfde9..4d83dcfde9 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/README
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/README
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/RELEASE_NOTES b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/RELEASE_NOTES
index a04ef5c553..a04ef5c553 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/RELEASE_NOTES
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/bin/INSTALL b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/bin/INSTALL
index 2da53a2b44..2da53a2b44 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/bin/INSTALL
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/bin/LICENSE b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/bin/LICENSE
index 5e1f585d46..5e1f585d46 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/bin/LICENSE
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/bin/NOTICE b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/bin/NOTICE
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/src/BUILDING b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/src/BUILDING
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/src/BUILDING
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/src/LICENSE b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/src/LICENSE
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/src/LICENSE
diff --git a/branches/sca-android/distribution/features/repository/src/main/release/src/NOTICE b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/branches/sca-android/distribution/features/repository/src/main/release/src/NOTICE
+++ b/sca-java-1.x/branches/sca-android/distribution/features/repository/src/main/release/src/NOTICE
diff --git a/branches/sca-android/distribution/pom.xml b/sca-java-1.x/branches/sca-android/distribution/pom.xml
index 43c37d15d4..43c37d15d4 100644
--- a/branches/sca-android/distribution/pom.xml
+++ b/sca-java-1.x/branches/sca-android/distribution/pom.xml
diff --git a/branches/sca-android/itest/admin/README b/sca-java-1.x/branches/sca-android/itest/admin/README
index c4e96d7af0..c4e96d7af0 100644
--- a/branches/sca-android/itest/admin/README
+++ b/sca-java-1.x/branches/sca-android/itest/admin/README
diff --git a/branches/sca-android/itest/admin/pom.xml b/sca-java-1.x/branches/sca-android/itest/admin/pom.xml
index 52a7bfb90a..52a7bfb90a 100644
--- a/branches/sca-android/itest/admin/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/admin/pom.xml
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
index b3d2137767..b3d2137767 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
index 025302fb6d..025302fb6d 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
index de480e6d85..de480e6d85 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
index 8ff146b630..8ff146b630 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
index 638c6aff8c..638c6aff8c 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
index bd820884e7..bd820884e7 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
index fa2720001b..fa2720001b 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
index eec64fa0d8..eec64fa0d8 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
index d712662cb3..d712662cb3 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java
diff --git a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
index 42fa3f0c41..42fa3f0c41 100644
--- a/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java
diff --git a/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java b/sca-java-1.x/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
index bcf4153064..bcf4153064 100644
--- a/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java
diff --git a/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
index 747f71576c..747f71576c 100644
--- a/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java
diff --git a/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
index 6c2dffb7b4..6c2dffb7b4 100644
--- a/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java
diff --git a/branches/sca-android/itest/admin/src/test/resources/Iteration1Composite.composite b/sca-java-1.x/branches/sca-android/itest/admin/src/test/resources/Iteration1Composite.composite
index 95dbbf0124..95dbbf0124 100644
--- a/branches/sca-android/itest/admin/src/test/resources/Iteration1Composite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/test/resources/Iteration1Composite.composite
diff --git a/branches/sca-android/itest/admin/src/test/resources/Iteration3Composite.composite b/sca-java-1.x/branches/sca-android/itest/admin/src/test/resources/Iteration3Composite.composite
index dd06d030d6..dd06d030d6 100644
--- a/branches/sca-android/itest/admin/src/test/resources/Iteration3Composite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/test/resources/Iteration3Composite.composite
diff --git a/branches/sca-android/itest/admin/src/test/resources/MySimpleService.composite b/sca-java-1.x/branches/sca-android/itest/admin/src/test/resources/MySimpleService.composite
index a1f8abb8da..a1f8abb8da 100644
--- a/branches/sca-android/itest/admin/src/test/resources/MySimpleService.composite
+++ b/sca-java-1.x/branches/sca-android/itest/admin/src/test/resources/MySimpleService.composite
diff --git a/branches/sca-android/itest/binding-sca-jms/client/pom.xml b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/pom.xml
index 9119be6ad6..9119be6ad6 100644
--- a/branches/sca-android/itest/binding-sca-jms/client/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/pom.xml
diff --git a/branches/sca-android/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
index d1b4ecbd15..d1b4ecbd15 100644
--- a/branches/sca-android/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/main/java/itest/MyClientImpl.java
diff --git a/branches/sca-android/itest/binding-sca-jms/client/src/main/java/itest/MyService.java b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
index e5123f087c..e5123f087c 100644
--- a/branches/sca-android/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/main/java/itest/MyService.java
diff --git a/branches/sca-android/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-android/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/binding-sca-jms/client/src/main/resources/MyClient.composite b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
index 81aa3ed98d..81aa3ed98d 100644
--- a/branches/sca-android/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/main/resources/MyClient.composite
diff --git a/branches/sca-android/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
index 5c56dbaf84..5c56dbaf84 100644
--- a/branches/sca-android/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/client/src/test/java/itest/MyClientTestCase.java
diff --git a/branches/sca-android/itest/binding-sca-jms/pom.xml b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/pom.xml
index 2a706dd404..2a706dd404 100644
--- a/branches/sca-android/itest/binding-sca-jms/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/pom.xml
diff --git a/branches/sca-android/itest/binding-sca-jms/service/pom.xml b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/pom.xml
index f57827b66d..f57827b66d 100644
--- a/branches/sca-android/itest/binding-sca-jms/service/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/pom.xml
diff --git a/branches/sca-android/itest/binding-sca-jms/service/src/main/java/itest/MyService.java b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
index e5123f087c..e5123f087c 100644
--- a/branches/sca-android/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/main/java/itest/MyService.java
diff --git a/branches/sca-android/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
index d0f8dcc393..d0f8dcc393 100644
--- a/branches/sca-android/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/main/java/itest/MyServiceImpl.java
diff --git a/branches/sca-android/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
index 8c311553c3..8c311553c3 100644
--- a/branches/sca-android/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/binding-sca-jms/service/src/main/resources/MyService.composite b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/main/resources/MyService.composite
index 03ac786809..03ac786809 100644
--- a/branches/sca-android/itest/binding-sca-jms/service/src/main/resources/MyService.composite
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/main/resources/MyService.composite
diff --git a/branches/sca-android/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
index cb79ae050a..cb79ae050a 100644
--- a/branches/sca-android/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/binding-sca-jms/service/src/test/java/itest/MyServiceTestCase.java
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/pom.xml b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/pom.xml
index 3a61b820d1..3a61b820d1 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/pom.xml
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index 532b84bd22..532b84bd22 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 86d7f245e8..86d7f245e8 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 8dea2715bf..8dea2715bf 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index 672dbdc0b5..672dbdc0b5 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index d7ebd5cbb8..d7ebd5cbb8 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index bdfedee2f8..bdfedee2f8 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index dfec43e8e1..dfec43e8e1 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index e768707ccd..e768707ccd 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
index 25d676bcfc..25d676bcfc 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index 5ec2cc9f2e..5ec2cc9f2e 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
index 13d12e32a0..13d12e32a0 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.componentType
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index 504e2ccc5d..504e2ccc5d 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 0f51b96b27..0f51b96b27 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 4e13380e0b..4e13380e0b 100644
--- a/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/pom.xml b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/pom.xml
index eb11a6ad7e..eb11a6ad7e 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/pom.xml
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
index ffdbc50a22..ffdbc50a22 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
index 6971151a77..6971151a77 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.componentType
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
index f864f45613..f864f45613 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/branches/sca-android/itest/bpel/helloworld/pom.xml b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/pom.xml
index 9b7786c270..9b7786c270 100644
--- a/branches/sca-android/itest/bpel/helloworld/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/pom.xml
diff --git a/branches/sca-android/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index ffdbc50a22..ffdbc50a22 100644
--- a/branches/sca-android/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-android/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 76fcd35c2d..76fcd35c2d 100644
--- a/branches/sca-android/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
index 9bd95b2c58..9bd95b2c58 100644
--- a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/deploy.xml
diff --git a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.componentType
diff --git a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index f6b12fb14b..f6b12fb14b 100644
--- a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/branches/sca-android/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/branches/sca-android/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/branches/sca-android/itest/bpel/pom.xml b/sca-java-1.x/branches/sca-android/itest/bpel/pom.xml
index 7168e27f98..7168e27f98 100644
--- a/branches/sca-android/itest/bpel/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/bpel/pom.xml
diff --git a/branches/sca-android/itest/builder/pom.xml b/sca-java-1.x/branches/sca-android/itest/builder/pom.xml
index 4855b0cfe6..4855b0cfe6 100644
--- a/branches/sca-android/itest/builder/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/pom.xml
diff --git a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
index 932ae3987a..932ae3987a 100644
--- a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
index f9ef0a1b4f..f9ef0a1b4f 100644
--- a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
index c041a76b47..c041a76b47 100644
--- a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
index ccfeff0997..ccfeff0997 100644
--- a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
index 9a775feec9..9a775feec9 100644
--- a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
index 98a1741fb6..98a1741fb6 100644
--- a/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index 256d01be58..256d01be58 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario1/scenario1.composite
index 5c2a98ab40..5c2a98ab40 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 21b5897aa1..21b5897aa1 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index 083079ba42..083079ba42 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario10/scenario10.composite
index c24b7f0046..c24b7f0046 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 27a73d5c41..27a73d5c41 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario10/service3.wsdl
index 14edcc00e6..14edcc00e6 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index a6e4b65970..a6e4b65970 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario11/scenario11.composite
index 3a94152e6a..3a94152e6a 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 6130c68651..6130c68651 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario11/service3.wsdl
index 14edcc00e6..14edcc00e6 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 125bdc5e53..125bdc5e53 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario12/scenario12.composite
index aabd445e23..aabd445e23 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario12/scenario12a.composite
index a2ccc47c28..a2ccc47c28 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index c906c6c5b0..c906c6c5b0 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario13/scenario13.composite
index ed59cd2adf..ed59cd2adf 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario13/scenario13a.composite
index 41150f78fd..41150f78fd 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index 6fa901c4df..6fa901c4df 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario2/scenario2.composite
index 66f88294ff..66f88294ff 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario2/scenario2a.composite
index db1af4743f..db1af4743f 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index f5899ab1f0..f5899ab1f0 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario3/scenario3.composite
index 4b37c19e4e..4b37c19e4e 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario3/scenario3a.composite
index fedd79ff3d..fedd79ff3d 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index 642245ea7e..642245ea7e 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario4/scenario4.composite
index 1bb876b33d..1bb876b33d 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario4/scenario4a.composite
index 55e13700a6..55e13700a6 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 92da17179f..92da17179f 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario5/scenario5.composite
index 403e19b087..403e19b087 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario5/scenario5a.composite
index 0e37ded0e4..0e37ded0e4 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index 42d45b0b98..42d45b0b98 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario6/scenario6.composite
index 1c89139905..1c89139905 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 853703a353..853703a353 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index 44c471cc65..44c471cc65 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario7/scenario7.composite
index 6b1ac24cec..6b1ac24cec 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario7/scenario7a.composite
index 8e0cebbdd5..8e0cebbdd5 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7cb09d0a74..7cb09d0a74 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario8/scenario8.composite
index 26e5ee33fa..26e5ee33fa 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 4fa0712199..4fa0712199 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 7480419231..7480419231 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index 6e0908702b..6e0908702b 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario9/scenario9.composite
index 3fce35470e..3fce35470e 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/branches/sca-android/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 6e86c547b3..6e86c547b3 100644
--- a/branches/sca-android/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-1.x/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index 1f45cb4a66..1f45cb4a66 100644
--- a/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java b/sca-java-1.x/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
index cad09920e8..cad09920e8 100644
--- a/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CompositeBuilderNonWiringImpl.java
diff --git a/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-1.x/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index 82a8ca6689..82a8ca6689 100644
--- a/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-1.x/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
index 9bff4d394e..9bff4d394e 100644
--- a/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/sca-java-1.x/branches/sca-android/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/branches/sca-android/itest/callablereferences-ws/pom.xml b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/pom.xml
index bd373b2ae6..bd373b2ae6 100644
--- a/branches/sca-android/itest/callablereferences-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/pom.xml
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
index ecf1ac27e1..ecf1ac27e1 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
index c46087d865..c46087d865 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
index 670c145cc3..670c145cc3 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
index eb4d647a22..eb4d647a22 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
index bb5e57397d..bb5e57397d 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Alpha.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
index 6e5f1cedf9..6e5f1cedf9 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
index 995e4fcf39..995e4fcf39 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Beta.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
index be72fd779e..be72fd779e 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/BetaImpl.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
index b73f26b573..b73f26b573 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/Gamma.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
index c3abc4c65d..c3abc4c65d 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/GammaImpl.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
index 3d782a0b84..3d782a0b84 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/resources/CallableReferenceWsReturnTest.composite
diff --git a/branches/sca-android/itest/callablereferences-ws/src/main/resources/example.composite b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/resources/example.composite
index ea0819a32e..ea0819a32e 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/main/resources/example.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/main/resources/example.composite
diff --git a/branches/sca-android/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
index 310e31fb02..310e31fb02 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-android/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
index 66fb2ef96c..66fb2ef96c 100644
--- a/branches/sca-android/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-android/itest/callablereferences/pom.xml b/sca-java-1.x/branches/sca-android/itest/callablereferences/pom.xml
index 323ee9c076..323ee9c076 100644
--- a/branches/sca-android/itest/callablereferences/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/pom.xml
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
index 5934f16851..5934f16851 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
index 7c2fd092dc..7c2fd092dc 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
index ade672b0ab..ade672b0ab 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
index 518e77d3a8..518e77d3a8 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
index fdf80cc1c8..fdf80cc1c8 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
index cc8ec8f000..cc8ec8f000 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
index 48b697df31..48b697df31 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
index 27ad48b9fe..27ad48b9fe 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
index abcedfa6e1..abcedfa6e1 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
index f2e0ce7582..f2e0ce7582 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
index ab21421c4d..ab21421c4d 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
index 5b5984b164..5b5984b164 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
index 223c467f47..223c467f47 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
index ed4e66bec3..ed4e66bec3 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
index e32051373f..e32051373f 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
index adf5a1c1ce..adf5a1c1ce 100644
--- a/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
diff --git a/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
index 0bf8f7ef1e..0bf8f7ef1e 100644
--- a/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
diff --git a/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
index 5b3add1e61..5b3add1e61 100644
--- a/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
diff --git a/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
index 49b75f56e4..49b75f56e4 100644
--- a/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
diff --git a/branches/sca-android/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
index 9216f44191..9216f44191 100644
--- a/branches/sca-android/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
diff --git a/branches/sca-android/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
index 95021f72a4..95021f72a4 100644
--- a/branches/sca-android/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
index 42d739564c..42d739564c 100644
--- a/branches/sca-android/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
diff --git a/branches/sca-android/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 2edda61601..2edda61601 100644
--- a/branches/sca-android/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
index a9cbb5d0a1..a9cbb5d0a1 100644
--- a/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
diff --git a/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
index ba9020811c..ba9020811c 100644
--- a/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
diff --git a/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
index f2d8fe5d64..f2d8fe5d64 100644
--- a/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
diff --git a/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
index d785a6a397..d785a6a397 100644
--- a/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
diff --git a/branches/sca-android/itest/callback-api/pom.xml b/sca-java-1.x/branches/sca-android/itest/callback-api/pom.xml
index 0175bef27f..0175bef27f 100644
--- a/branches/sca-android/itest/callback-api/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/pom.xml
diff --git a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index de17ba2f0d..de17ba2f0d 100644
--- a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 5fd4a71466..5fd4a71466 100644
--- a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index 274984abb3..274984abb3 100644
--- a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index 33de1e7739..33de1e7739 100644
--- a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 61e2c7ee8f..61e2c7ee8f 100644
--- a/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/branches/sca-android/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/resources/CallBackApiTest.composite
index 946c4862ee..946c4862ee 100644
--- a/branches/sca-android/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/branches/sca-android/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index 19eb25631e..19eb25631e 100644
--- a/branches/sca-android/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-1.x/branches/sca-android/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 9471049c74..9471049c74 100644
--- a/branches/sca-android/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/branches/sca-android/itest/callback-basic/pom.xml b/sca-java-1.x/branches/sca-android/itest/callback-basic/pom.xml
index 1108a4ce37..1108a4ce37 100644
--- a/branches/sca-android/itest/callback-basic/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/pom.xml
diff --git a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 5e9d3d6821..5e9d3d6821 100644
--- a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 9f4019f28c..9f4019f28c 100644
--- a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index e0e6d7eb8c..e0e6d7eb8c 100644
--- a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index bd41fa7037..bd41fa7037 100644
--- a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 4ca2dc9af9..4ca2dc9af9 100644
--- a/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/branches/sca-android/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index c506956088..c506956088 100644
--- a/branches/sca-android/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/branches/sca-android/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index adf28214f6..adf28214f6 100644
--- a/branches/sca-android/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 32c26a348a..32c26a348a 100644
--- a/branches/sca-android/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/branches/sca-android/itest/callback-complex-type/pom.xml b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/pom.xml
index 371b72242d..371b72242d 100644
--- a/branches/sca-android/itest/callback-complex-type/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/pom.xml
diff --git a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 9fddb850ba..9fddb850ba 100644
--- a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 739983c277..739983c277 100644
--- a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index d2b03fcde7..d2b03fcde7 100644
--- a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index ffbf4f35fa..ffbf4f35fa 100644
--- a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index dc31ed156b..dc31ed156b 100644
--- a/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/branches/sca-android/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 3f48f16389..3f48f16389 100644
--- a/branches/sca-android/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/branches/sca-android/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index ff38134df5..ff38134df5 100644
--- a/branches/sca-android/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/branches/sca-android/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
index 33d1afaecd..33d1afaecd 100644
--- a/branches/sca-android/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
diff --git a/branches/sca-android/itest/callback-id/pom.xml b/sca-java-1.x/branches/sca-android/itest/callback-id/pom.xml
index e8da0dfc2c..e8da0dfc2c 100644
--- a/branches/sca-android/itest/callback-id/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-id/pom.xml
diff --git a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index b14560a8c3..b14560a8c3 100644
--- a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
diff --git a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index a9e551f8b4..a9e551f8b4 100644
--- a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
diff --git a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index 59c9c3d069..59c9c3d069 100644
--- a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
diff --git a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index 18c592a1c1..18c592a1c1 100644
--- a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
diff --git a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 8b0a4b69cf..8b0a4b69cf 100644
--- a/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
diff --git a/branches/sca-android/itest/callback-id/src/main/resources/CallBackIdClient.composite b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/resources/CallBackIdClient.composite
index c9a6ba6258..c9a6ba6258 100644
--- a/branches/sca-android/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callback-id/src/main/resources/CallBackIdClient.composite
diff --git a/branches/sca-android/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/sca-java-1.x/branches/sca-android/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
index 771fbb8ff7..771fbb8ff7 100644
--- a/branches/sca-android/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
diff --git a/branches/sca-android/itest/callback-multiple-wires/pom.xml b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/pom.xml
index 43fc9e2ec3..43fc9e2ec3 100644
--- a/branches/sca-android/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/pom.xml
diff --git a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index df91f3d268..df91f3d268 100644
--- a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index a0a9564002..a0a9564002 100644
--- a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index cfd601f546..cfd601f546 100644
--- a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index d19b3fe355..d19b3fe355 100644
--- a/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/branches/sca-android/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 3dae3ca3a8..3dae3ca3a8 100644
--- a/branches/sca-android/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/branches/sca-android/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index 3c83e4bedd..3c83e4bedd 100644
--- a/branches/sca-android/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/branches/sca-android/itest/callback-separatethread/pom.xml b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/pom.xml
index 7cfc5ce992..7cfc5ce992 100644
--- a/branches/sca-android/itest/callback-separatethread/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/pom.xml
diff --git a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index f812a39058..f812a39058 100644
--- a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index e861f8a3d1..e861f8a3d1 100644
--- a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index ae41f596fc..ae41f596fc 100644
--- a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index c22b8cceec..c22b8cceec 100644
--- a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index 4d672b3a8b..4d672b3a8b 100644
--- a/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/branches/sca-android/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index e111e5074c..e111e5074c 100644
--- a/branches/sca-android/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/branches/sca-android/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index f7e7be2133..f7e7be2133 100644
--- a/branches/sca-android/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/branches/sca-android/itest/callback-set-callback/pom.xml b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/pom.xml
index a9883a4253..a9883a4253 100644
--- a/branches/sca-android/itest/callback-set-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/pom.xml
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index 3b9599f53f..3b9599f53f 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index 48752f2ea1..48752f2ea1 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index ad0e0603a3..ad0e0603a3 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
index 0a22b0e01f..0a22b0e01f 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 94cb6aa73b..94cb6aa73b 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index 66e4d3fc05..66e4d3fc05 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
index afedcdf7f1..afedcdf7f1 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
index 4a6c9dbaa6..4a6c9dbaa6 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
diff --git a/branches/sca-android/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
index 3552ddecab..3552ddecab 100644
--- a/branches/sca-android/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
diff --git a/branches/sca-android/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
index 496ae0b1a5..496ae0b1a5 100644
--- a/branches/sca-android/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
diff --git a/branches/sca-android/itest/callback-set-conversation/pom.xml b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/pom.xml
index 23fa07b2ae..23fa07b2ae 100644
--- a/branches/sca-android/itest/callback-set-conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/pom.xml
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
index d97c69eaed..d97c69eaed 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index a704fd0ece..a704fd0ece 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index 013424bf5e..013424bf5e 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index 5d692e7728..5d692e7728 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
index 75a4a3a6a0..75a4a3a6a0 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
index e7a3b144f6..e7a3b144f6 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 692b6dfc35..692b6dfc35 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
index bca94ce407..bca94ce407 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
diff --git a/branches/sca-android/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
index ce73417f94..ce73417f94 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
diff --git a/branches/sca-android/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
index 45bdaea9ab..45bdaea9ab 100644
--- a/branches/sca-android/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
diff --git a/branches/sca-android/itest/component-type/pom.xml b/sca-java-1.x/branches/sca-android/itest/component-type/pom.xml
index 33a735a418..33a735a418 100644
--- a/branches/sca-android/itest/component-type/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/pom.xml
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 08afd922b3..08afd922b3 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-android/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/branches/sca-android/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/itest/component-type/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/Calculator.composite
index b229787657..b229787657 100644
--- a/branches/sca-android/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/Calculator.composite
diff --git a/branches/sca-android/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index 00c48e5a35..00c48e5a35 100644
--- a/branches/sca-android/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/branches/sca-android/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index 74bedc0a98..74bedc0a98 100644
--- a/branches/sca-android/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/branches/sca-android/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 289fcc3e11..289fcc3e11 100644
--- a/branches/sca-android/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/branches/sca-android/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2d8a879cda..2d8a879cda 100644
--- a/branches/sca-android/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/branches/sca-android/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 6214955141..6214955141 100644
--- a/branches/sca-android/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/branches/sca-android/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-android/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index 08fc8e33bf..08fc8e33bf 100644
--- a/branches/sca-android/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/build-jar.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/build-jar.xml
index 299ce6864f..299ce6864f 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/build-jar.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/pom.xml
index 53416eb338..53416eb338 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/pom.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 814c38777a..814c38777a 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index e4daf0ec02..e4daf0ec02 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
index e4b3bc7048..e4b3bc7048 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index 698aa2aa5d..698aa2aa5d 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 9e01f00a79..9e01f00a79 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index cdd12d589d..cdd12d589d 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
index 714d1826e1..714d1826e1 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
index 7f7dc969e2..7f7dc969e2 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 8a2bec308f..8a2bec308f 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
index c77c4c1c7e..c77c4c1c7e 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
index d118cceef9..d118cceef9 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index d37b6659da..d37b6659da 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 77b28d9023..77b28d9023 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 8ec290a831..8ec290a831 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index 1398416978..1398416978 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
index db1f0d34e7..db1f0d34e7 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
index a76fae8090..a76fae8090 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-test/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-test/pom.xml
index 5c22d215be..5c22d215be 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-test/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-test/pom.xml
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
index 692f16f6f6..692f16f6f6 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
index 1ec7aaaa3a..1ec7aaaa3a 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
diff --git a/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
index b123951ef6..b123951ef6 100644
--- a/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
diff --git a/branches/sca-android/itest/contribution-classloader/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/pom.xml
index 4007f0115c..4007f0115c 100644
--- a/branches/sca-android/itest/contribution-classloader/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-classloader/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-composite/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/pom.xml
index 4aea1320f3..4aea1320f3 100644
--- a/branches/sca-android/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index e65422136f..e65422136f 100644
--- a/branches/sca-android/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/branches/sca-android/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index 5369c18497..5369c18497 100644
--- a/branches/sca-android/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/branches/sca-android/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index 3c14560a56..3c14560a56 100644
--- a/branches/sca-android/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index 636b7111d9..636b7111d9 100644
--- a/branches/sca-android/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/branches/sca-android/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 72b77564d2..72b77564d2 100644
--- a/branches/sca-android/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/branches/sca-android/itest/contribution-import-export/export-java/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-java/pom.xml
index 24346c6d1c..24346c6d1c 100644
--- a/branches/sca-android/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-java/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-android/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index dc33dfa560..dc33dfa560 100644
--- a/branches/sca-android/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/branches/sca-android/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/branches/sca-android/itest/contribution-import-export/export-resource/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-resource/pom.xml
index ed399193df..ed399193df 100644
--- a/branches/sca-android/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-resource/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/branches/sca-android/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/branches/sca-android/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/branches/sca-android/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-wsdl/pom.xml
index af619849ea..af619849ea 100644
--- a/branches/sca-android/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index b7394ec14b..b7394ec14b 100644
--- a/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/pom.xml
index 6decf86182..6decf86182 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index 966f56d7d5..966f56d7d5 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 9f3f5be452..9f3f5be452 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 9b31363e1a..9b31363e1a 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d3c83b08c6..d3c83b08c6 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index e2f852ff7e..e2f852ff7e 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/branches/sca-android/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 1176a89143..1176a89143 100644
--- a/branches/sca-android/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-java/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/pom.xml
index ee11269c71..ee11269c71 100644
--- a/branches/sca-android/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-android/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/branches/sca-android/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index 9b650e4acc..9b650e4acc 100644
--- a/branches/sca-android/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/branches/sca-android/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 431988cc04..431988cc04 100644
--- a/branches/sca-android/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-resource/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-resource/pom.xml
index d3ea4f42dd..d3ea4f42dd 100644
--- a/branches/sca-android/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-resource/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/branches/sca-android/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/branches/sca-android/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/branches/sca-android/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/branches/sca-android/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/pom.xml
index 38e69bd152..38e69bd152 100644
--- a/branches/sca-android/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 4cdcc1fd0b..4cdcc1fd0b 100644
--- a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index 3d43290380..3d43290380 100644
--- a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 74d22ed830..74d22ed830 100644
--- a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index d46fe0b57c..d46fe0b57c 100644
--- a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 5008a2ea5b..5008a2ea5b 100644
--- a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 5c40606e50..5c40606e50 100644
--- a/branches/sca-android/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/branches/sca-android/itest/contribution-import-export/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/pom.xml
index 070263ea32..070263ea32 100644
--- a/branches/sca-android/itest/contribution-import-export/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-import-export/pom.xml
diff --git a/branches/sca-android/itest/contribution-multiple/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/pom.xml
index a87e983bb3..a87e983bb3 100644
--- a/branches/sca-android/itest/contribution-multiple/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/pom.xml
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/java/hello/Hello.java b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/hello/Hello.java
index 7e574a7db3..7e574a7db3 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/hello/Hello.java
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
index 5251fc0a45..5251fc0a45 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
index ec5123eb2d..ec5123eb2d 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
index 133c98f357..133c98f357 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
index 790b6fed98..790b6fed98 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
index 8b76783c3d..8b76783c3d 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
index 7a8003577e..7a8003577e 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
index bfbf74373a..bfbf74373a 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
index 45cb504ea4..45cb504ea4 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
index cbabdcd4fc..cbabdcd4fc 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
index 4c9225de34..4c9225de34 100644
--- a/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
diff --git a/branches/sca-android/itest/contribution/pom.xml b/sca-java-1.x/branches/sca-android/itest/contribution/pom.xml
index 1c219cbd6c..1c219cbd6c 100644
--- a/branches/sca-android/itest/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/pom.xml
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/AddService.java
index 4e72f92fda..4e72f92fda 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/AddServiceImpl.java
index e9c635e3c8..e9c635e3c8 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorClient.java
index 40ca4d9b0f..40ca4d9b0f 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorService.java
index f288af0174..f288af0174 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
index ae4ed12b7b..ae4ed12b7b 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/DivideService.java
index ad99418f5b..ad99418f5b 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/MultiplyService.java
index 3987b0a54f..3987b0a54f 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/SubtractService.java
index 25e0ed6ca7..25e0ed6ca7 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-android/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
index 1a7f145ad8..1a7f145ad8 100644
--- a/branches/sca-android/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/itest/contribution/src/main/resources/ContributionTest.composite b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/resources/ContributionTest.composite
index d814e439e2..d814e439e2 100644
--- a/branches/sca-android/itest/contribution/src/main/resources/ContributionTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/resources/ContributionTest.composite
diff --git a/branches/sca-android/itest/contribution/src/main/resources/calculator/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/resources/calculator/Calculator.composite
index 657a2f95d8..657a2f95d8 100644
--- a/branches/sca-android/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/resources/calculator/Calculator.composite
diff --git a/branches/sca-android/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/resources/calculator/sca-contribution.xml
index e95796d83a..e95796d83a 100644
--- a/branches/sca-android/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/main/resources/calculator/sca-contribution.xml
diff --git a/branches/sca-android/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
index 97b2e5d6ed..97b2e5d6ed 100644
--- a/branches/sca-android/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
diff --git a/branches/sca-android/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-android/itest/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-android/itest/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-android/itest/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-android/itest/contribution/src/test/resources/repository/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-android/itest/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-android/itest/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-android/itest/conversations-ws/pom.xml b/sca-java-1.x/branches/sca-android/itest/conversations-ws/pom.xml
index 87827c86dd..87827c86dd 100644
--- a/branches/sca-android/itest/conversations-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/pom.xml
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
index 9cd88620e3..9cd88620e3 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..53dadc3dc7 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index cb7a032e85..cb7a032e85 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..2532346349 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 1e36ce6917..1e36ce6917 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index b4d3fe3d71..b4d3fe3d71 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index ed3a01c10b..ed3a01c10b 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 1603916cca..1603916cca 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index accc1eee27..accc1eee27 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 90f6de86ac..90f6de86ac 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 3f7a90b3dc..3f7a90b3dc 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index ab91498132..ab91498132 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index e4f83656de..e4f83656de 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9f4857f703..9f4857f703 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index 4b06251414..4b06251414 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index be039748fc..be039748fc 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 42f2f1a603..42f2f1a603 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index a852aeda56..a852aeda56 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-android/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
index d5a1ff7410..d5a1ff7410 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
index c4da99145d..c4da99145d 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
diff --git a/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
index 20a92c9dc7..20a92c9dc7 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
diff --git a/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
index 73d078674c..73d078674c 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
index 9c6b0a2b34..9c6b0a2b34 100644
--- a/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
diff --git a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 9df966ebc2..9df966ebc2 100644
--- a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
diff --git a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index ebd1e55dac..ebd1e55dac 100644
--- a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
diff --git a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index 2c16145f54..2c16145f54 100644
--- a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
diff --git a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index 4166e6acdf..4166e6acdf 100644
--- a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
diff --git a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 6023b7cd53..6023b7cd53 100644
--- a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
diff --git a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index fb3a3cec6f..fb3a3cec6f 100644
--- a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
diff --git a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 5fbe2c3f69..5fbe2c3f69 100644
--- a/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
diff --git a/branches/sca-android/itest/conversations/pom.xml b/sca-java-1.x/branches/sca-android/itest/conversations/pom.xml
index 68e771f2d4..68e771f2d4 100644
--- a/branches/sca-android/itest/conversations/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/pom.xml
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
index a3b83dfc14..a3b83dfc14 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
index 8e98b9cbd4..8e98b9cbd4 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
index e7583c339a..e7583c339a 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
index bc4a5fc571..bc4a5fc571 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
index 77d7f4c007..77d7f4c007 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
index e422938b27..e422938b27 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
index a6dbf56797..a6dbf56797 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
index 3f04e9f09e..3f04e9f09e 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
index 53dadc3dc7..53dadc3dc7 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 8cad88d2f4..8cad88d2f4 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index 2532346349..2532346349 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 8f008fa711..8f008fa711 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index 546382cfd1..546382cfd1 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index f1a21cc18f..f1a21cc18f 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
index 74afbfb763..74afbfb763 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
index 5f97b16088..5f97b16088 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index 3ce3e3ada7..3ce3e3ada7 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
index 95c9c7ae6e..95c9c7ae6e 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
index a5f37f7a52..a5f37f7a52 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
index c1e27641ef..c1e27641ef 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
index 900b8f743f..900b8f743f 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
index b21f956bd9..b21f956bd9 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
index 9deef312ac..9deef312ac 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
index cffa76186a..cffa76186a 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
index 1272c7ab7f..1272c7ab7f 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
index 847b038881..847b038881 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
index b77e4c0194..b77e4c0194 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
index 5b3906fc2c..5b3906fc2c 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
index 8fe7c5b6ba..8fe7c5b6ba 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
index 9a25f0f59a..9a25f0f59a 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
index efcbdff06f..efcbdff06f 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
index 8454b3846b..8454b3846b 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
index 07186c91e1..07186c91e1 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
index 344aa99dff..344aa99dff 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
index 8d79bb75e8..8d79bb75e8 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
index d1b769216b..d1b769216b 100644
--- a/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
diff --git a/branches/sca-android/itest/conversations/src/main/resources/ConversationAge.composite b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/ConversationAge.composite
index abd1c35ced..abd1c35ced 100644
--- a/branches/sca-android/itest/conversations/src/main/resources/ConversationAge.composite
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/ConversationAge.composite
diff --git a/branches/sca-android/itest/conversations/src/main/resources/ConversationUniqueId.composite b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/ConversationUniqueId.composite
index 831449a079..831449a079 100644
--- a/branches/sca-android/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/ConversationUniqueId.composite
diff --git a/branches/sca-android/itest/conversations/src/main/resources/conversationId.composite b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/conversationId.composite
index e61eb08194..e61eb08194 100644
--- a/branches/sca-android/itest/conversations/src/main/resources/conversationId.composite
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/conversationId.composite
diff --git a/branches/sca-android/itest/conversations/src/main/resources/conversationLifetime.composite b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/conversationLifetime.composite
index 3b79dc43d9..3b79dc43d9 100644
--- a/branches/sca-android/itest/conversations/src/main/resources/conversationLifetime.composite
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/conversationLifetime.composite
diff --git a/branches/sca-android/itest/conversations/src/main/resources/conversational.composite b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/conversational.composite
index 4da3ce74d5..4da3ce74d5 100644
--- a/branches/sca-android/itest/conversations/src/main/resources/conversational.composite
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/main/resources/conversational.composite
diff --git a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
index 3e750bdd1e..3e750bdd1e 100644
--- a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
diff --git a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
index 326a833a42..326a833a42 100644
--- a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
diff --git a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
index 431962221a..431962221a 100644
--- a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
diff --git a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
index cc31c77873..cc31c77873 100644
--- a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
diff --git a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
index 8480e04028..8480e04028 100644
--- a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
diff --git a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
index da359bc296..da359bc296 100644
--- a/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
diff --git a/branches/sca-android/itest/corba/pom.xml b/sca-java-1.x/branches/sca-android/itest/corba/pom.xml
index 9670e8059f..9670e8059f 100644
--- a/branches/sca-android/itest/corba/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/corba/pom.xml
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
index 46e214eac3..46e214eac3 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
index cba8c823e8..cba8c823e8 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
index 0135c04495..0135c04495 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
index 3c12bf1b8c..3c12bf1b8c 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
index a738c6f211..a738c6f211 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
index 008212bdbe..008212bdbe 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
index bd1ce8cb49..bd1ce8cb49 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
index c25372c837..c25372c837 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
index abcec43d0e..abcec43d0e 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
index 171a7919a2..171a7919a2 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
index 5f2dc56033..5f2dc56033 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
index 24a628d406..24a628d406 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
index da37f28e39..da37f28e39 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
index 7b2466f791..7b2466f791 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
index 27052a1549..27052a1549 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
index 57daa51f42..57daa51f42 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
index 88fef0b4fb..88fef0b4fb 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
index 40c017dd29..40c017dd29 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
index 6ec067521e..6ec067521e 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
index 8955f81694..8955f81694 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
index 940b391499..940b391499 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
index 63a11dc56a..63a11dc56a 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
index 8c0bfc9e39..8c0bfc9e39 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
index 72ff55a711..72ff55a711 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
index 8a063b8b9d..8a063b8b9d 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
index 4a3376c476..4a3376c476 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
index 9b89d7f98a..9b89d7f98a 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
index 3c1a1c9a83..3c1a1c9a83 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
index 13f294b871..13f294b871 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
index 66cc1d1e82..66cc1d1e82 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
index f14394b400..f14394b400 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
index 56388624d7..56388624d7 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
index 1897d0682c..1897d0682c 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
index c8c88ef91d..c8c88ef91d 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
index 5540b98c21..5540b98c21 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
index 648144299c..648144299c 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
index b57e098a56..b57e098a56 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
index 8ddfa10575..8ddfa10575 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
index 9717629711..9717629711 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
index 1247b4618d..1247b4618d 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
index f2cc3adad5..f2cc3adad5 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
index dbad550222..dbad550222 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
index d29129236c..d29129236c 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
index 837ba04cea..837ba04cea 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
index 0b24056642..0b24056642 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
index e2ed1ab037..e2ed1ab037 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
index 46888399ed..46888399ed 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
index c276038050..c276038050 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
index 079a56b446..079a56b446 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
index 0407184598..0407184598 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
index 16e099cfa3..16e099cfa3 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
index b4883cb35c..b4883cb35c 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
index c96fb61204..c96fb61204 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
index 3427c127ec..3427c127ec 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
index 78464fe40d..78464fe40d 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
index faff36c2a4..faff36c2a4 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
index 750006cec6..750006cec6 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
index ef9f561d1b..ef9f561d1b 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
index 4f6eacc9ff..4f6eacc9ff 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
index a3be6daa23..a3be6daa23 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
index dc752a2aea..dc752a2aea 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
index aec0f7b1bf..aec0f7b1bf 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
index 04aef326af..04aef326af 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
index bc76373633..bc76373633 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
index 2f10177bd0..2f10177bd0 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
index de8624455f..de8624455f 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
index 30e4e2994a..30e4e2994a 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
index 9b49adbfbb..9b49adbfbb 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
index 7889a80bf1..7889a80bf1 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
index cdd49904d3..cdd49904d3 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
index adb48aa159..adb48aa159 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
index 71003d008f..71003d008f 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
index 271f1e669b..271f1e669b 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
index d7734c48a3..d7734c48a3 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
index 1b44da9752..1b44da9752 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
index eb76c94643..eb76c94643 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
index 922759cd8d..922759cd8d 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
index a4f15488cd..a4f15488cd 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
index 47f0775c16..47f0775c16 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
index 3b4943a43d..3b4943a43d 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
index 7d43badb23..7d43badb23 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
index 8e76958e31..8e76958e31 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
index 1e4264256b..1e4264256b 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
index 917cceedf5..917cceedf5 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
index b679214c6c..b679214c6c 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
index 415634c80f..415634c80f 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
index d7c72b40da..d7c72b40da 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
diff --git a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
index cb868d18a0..cb868d18a0 100644
--- a/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
diff --git a/branches/sca-android/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3e77527d73..3e77527d73 100644
--- a/branches/sca-android/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioFive.composite
index 3c73e238a5..3c73e238a5 100644
--- a/branches/sca-android/itest/corba/src/test/resources/ScenarioFive.composite
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioFive.composite
diff --git a/branches/sca-android/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioFour.composite
index 01d7e2314a..01d7e2314a 100644
--- a/branches/sca-android/itest/corba/src/test/resources/ScenarioFour.composite
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioFour.composite
diff --git a/branches/sca-android/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioOne.composite
index c10b383661..c10b383661 100644
--- a/branches/sca-android/itest/corba/src/test/resources/ScenarioOne.composite
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioOne.composite
diff --git a/branches/sca-android/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioSix.composite
index 88238478c1..88238478c1 100644
--- a/branches/sca-android/itest/corba/src/test/resources/ScenarioSix.composite
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioSix.composite
diff --git a/branches/sca-android/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioThree.composite
index f43e4a3f7a..f43e4a3f7a 100644
--- a/branches/sca-android/itest/corba/src/test/resources/ScenarioThree.composite
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioThree.composite
diff --git a/branches/sca-android/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioTwo.composite
index dc5ddc50d3..dc5ddc50d3 100644
--- a/branches/sca-android/itest/corba/src/test/resources/ScenarioTwo.composite
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/ScenarioTwo.composite
diff --git a/branches/sca-android/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/itest_scenario.idl
index 41489a4565..41489a4565 100644
--- a/branches/sca-android/itest/corba/src/test/resources/itest_scenario.idl
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/itest_scenario.idl
diff --git a/branches/sca-android/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/scenariofour.xsd
index 2669b54be3..2669b54be3 100644
--- a/branches/sca-android/itest/corba/src/test/resources/scenariofour.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/corba/src/test/resources/scenariofour.xsd
diff --git a/branches/sca-android/itest/databindings/common/pom.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/pom.xml
index 40f2999c9c..40f2999c9c 100644
--- a/branches/sca-android/itest/databindings/common/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/pom.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
index adb546a1ea..adb546a1ea 100644
--- a/branches/sca-android/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
index b2346aa973..b2346aa973 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
index 88616cc997..88616cc997 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
index 77a12e92ec..77a12e92ec 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
index ee73db6152..ee73db6152 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
index aab564dc1e..aab564dc1e 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
index 5507a0b747..5507a0b747 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/generate/generate.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/generate.xsd
index 1fabedf55f..1fabedf55f 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
index 8927d725b6..8927d725b6 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Annotation.xml
index f1f4346e58..f1f4346e58 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
index 1fae43eb09..1fae43eb09 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Attribute.xml
index c20c80b658..c20c80b658 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
index bd3db2e030..bd3db2e030 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
index 30e4979dca..30e4979dca 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
index e7738dcff7..e7738dcff7 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
index 9552421e2d..9552421e2d 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
index c7b9655749..c7b9655749 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
index 5e5e7fbd55..5e5e7fbd55 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
index 5c455c2ab5..5c455c2ab5 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
index 635e851632..635e851632 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
index 004dab4fbb..004dab4fbb 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
index 136092951b..136092951b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
index 796f08e1cf..796f08e1cf 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
index 927b94885c..927b94885c 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
index 93f83cd0a1..93f83cd0a1 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
index ea7db70595..ea7db70595 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
index c64323e7e1..c64323e7e1 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
index 85c7d85fd4..85c7d85fd4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
index 543f276c50..543f276c50 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
index fcd281539b..fcd281539b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
index 1610c2b861..1610c2b861 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
index 36a0760a61..36a0760a61 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
index 999b72bb35..999b72bb35 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
index 5849165fe0..5849165fe0 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
index 71dad561ca..71dad561ca 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
index 8acf9376d7..8acf9376d7 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
index a49987c352..a49987c352 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
index a35b6e174a..a35b6e174a 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
index e1995890f9..e1995890f9 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
index 91cfce51b8..91cfce51b8 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
index a2f86ba8c5..a2f86ba8c5 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
index 907474cd1b..907474cd1b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
index a2f6bcfa77..a2f6bcfa77 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
index c5820e1a2e..c5820e1a2e 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
index f4d596bfe3..f4d596bfe3 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
index 0debe2fec5..0debe2fec5 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
index b5bcfdcfd4..b5bcfdcfd4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
index 7f001254cc..7f001254cc 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
index 8d4d106f59..8d4d106f59 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
index f875b9f94d..f875b9f94d 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
index 4c8a39b06c..4c8a39b06c 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
index 7d343d6dda..7d343d6dda 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
index bb12bc04a9..bb12bc04a9 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
index 7a81f3b0dd..7a81f3b0dd 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
index f0e1c21233..f0e1c21233 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
index d35568b3c9..d35568b3c9 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
index 92bd9a4b66..92bd9a4b66 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
index 52cdfa8c4e..52cdfa8c4e 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
index 78d001a585..78d001a585 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
index 2609a858f7..2609a858f7 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
index 38f6c55059..38f6c55059 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
index 7868a47ca3..7868a47ca3 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
index 0d65b124ff..0d65b124ff 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
index 3f5080d49f..3f5080d49f 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
index 340555dc5f..340555dc5f 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
index 0deb7af980..0deb7af980 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
index 8059fe6da0..8059fe6da0 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
index 06c92ce19b..06c92ce19b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
index 7b1f02d1d4..7b1f02d1d4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
index 9bc0cefd0f..9bc0cefd0f 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
index 0c207983bc..0c207983bc 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
index f91b602f99..f91b602f99 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
index b99bf01b73..b99bf01b73 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
index c99698e175..c99698e175 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
index b5b9b0d1eb..b5b9b0d1eb 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
index 80d22ce057..80d22ce057 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
index 4902935db5..4902935db5 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
index 664bf824b4..664bf824b4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
index 5d3658d224..5d3658d224 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
index c5861fa92a..c5861fa92a 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
index 0aa4710057..0aa4710057 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
index 1f95950394..1f95950394 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
index 6ee9c435db..6ee9c435db 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
index 0297f1aeb4..0297f1aeb4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
index 56d027bdbb..56d027bdbb 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
index 81ba1069bd..81ba1069bd 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
index 866ab73024..866ab73024 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
index 8bb3a08b94..8bb3a08b94 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
index c7c62f812b..c7c62f812b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
index 8235718c5e..8235718c5e 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
index 36caba2f16..36caba2f16 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
index 599c428a44..599c428a44 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
index 389d5a99f0..389d5a99f0 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
index 919c4a20ee..919c4a20ee 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
index 59887078b5..59887078b5 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
index 79011f26ab..79011f26ab 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
index 5de7d64d7b..5de7d64d7b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
index c40be9e18b..c40be9e18b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
index d4a78787b8..d4a78787b8 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
index c30434de66..c30434de66 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
index 5381590cd1..5381590cd1 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
index 4cd6ea7e72..4cd6ea7e72 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
index e8faf6225b..e8faf6225b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
index b4375467c4..b4375467c4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
index a4f564d9b7..a4f564d9b7 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
index d30ab85530..d30ab85530 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
index 8abb34b5a5..8abb34b5a5 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
index 7fd9a061ae..7fd9a061ae 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
index 1615976813..1615976813 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
index cd567ba528..cd567ba528 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
index 0beaac571f..0beaac571f 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
index 025362defb..025362defb 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
index d6d951fe5d..d6d951fe5d 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
index 5736a8c121..5736a8c121 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
index 242be1d53b..242be1d53b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
index d728115a77..d728115a77 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
index 108e3a8619..108e3a8619 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
index d4ffae5e17..d4ffae5e17 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
index 5ee5e0229e..5ee5e0229e 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
index 3d5aed5aa8..3d5aed5aa8 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
index e7b80ab11c..e7b80ab11c 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
index 2b4fe5594e..2b4fe5594e 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
index fc4deb63c2..fc4deb63c2 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
index 03570f41d9..03570f41d9 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
index c754502645..c754502645 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
index 4603793bfc..4603793bfc 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
index 4bcd2f8c46..4bcd2f8c46 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
index a6861f803a..a6861f803a 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
index 8bb251cab2..8bb251cab2 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
index 467ec007ed..467ec007ed 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
index 8d00646678..8d00646678 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
index 7deafd798a..7deafd798a 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
index 72ac75fee0..72ac75fee0 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
index f6208f81b3..f6208f81b3 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
index 1f26e13673..1f26e13673 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
index 97de7b98eb..97de7b98eb 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
index 67716553d8..67716553d8 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
index 5941348921..5941348921 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
index 24d5d09054..24d5d09054 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
index f684d06a4d..f684d06a4d 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
index de4a8a666d..de4a8a666d 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
index 242908bd27..242908bd27 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
index 4c00fbe295..4c00fbe295 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
index 925e8625d5..925e8625d5 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
index b12bec040b..b12bec040b 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
index c73708ce46..c73708ce46 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
index 795c3ea7d9..795c3ea7d9 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
index 3ebdc89ae0..3ebdc89ae0 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
index 21546d0f67..21546d0f67 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
index 89657e42ca..89657e42ca 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
index d01b4172e4..d01b4172e4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
index 82fd1eedaf..82fd1eedaf 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
index e1dcf06194..e1dcf06194 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
index ebf03c9d5d..ebf03c9d5d 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
index 8b9ba5b4b8..8b9ba5b4b8 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
index 26466b1b39..26466b1b39 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
index ff418c56ab..ff418c56ab 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
index 27bb1ce9cc..27bb1ce9cc 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
index 2bf1df8c99..2bf1df8c99 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
index 9b5561ed43..9b5561ed43 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
index 0b4e7bdf45..0b4e7bdf45 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
index f1b7cd264c..f1b7cd264c 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
index a2c8456257..a2c8456257 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
index 1f60b0423f..1f60b0423f 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
index 21e55ab8c1..21e55ab8c1 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
index 30762f4912..30762f4912 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
index 5bf35d0d70..5bf35d0d70 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
index 2dd01e4090..2dd01e4090 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
index 6920cd8dd0..6920cd8dd0 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
index 6a526bdc47..6a526bdc47 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
index 1117a95eb8..1117a95eb8 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
index ab91458bff..ab91458bff 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
index 3e015843b5..3e015843b5 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
index b6d68fd08a..b6d68fd08a 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
index d4453a4477..d4453a4477 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
index 6de3adc937..6de3adc937 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
index 786ab226da..786ab226da 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
index 64093aa803..64093aa803 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
index 01f4c2b1ef..01f4c2b1ef 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
index 774646f682..774646f682 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
index 34da37564c..34da37564c 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
index a1fb3aa803..a1fb3aa803 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
index 8eb7a4fce4..8eb7a4fce4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
index f68eb1939d..f68eb1939d 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
index b9f77e6658..b9f77e6658 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Import.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Import.xml
index fd28850050..fd28850050 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Import.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Import.xsd
index eae93fd44a..eae93fd44a 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
index a7e568decf..a7e568decf 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Include.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Include.xml
index d4b9e24fa6..d4b9e24fa6 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Include.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Include.xsd
index 34ff314a19..34ff314a19 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Interop.xsd
index ae22ab2c44..ae22ab2c44 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Notation.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Notation.xml
index b75ac6500a..b75ac6500a 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Notation.xsd
index 6ad019cb81..6ad019cb81 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Person.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Person.xsd
index 5f5021b15e..5f5021b15e 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
index 6c5ad88ff4..6c5ad88ff4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
index 6b7e39b334..6b7e39b334 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
index f9d4a24a49..f9d4a24a49 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
index f649e2ba83..f649e2ba83 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
index 410df4b7e4..410df4b7e4 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
index 5d27ef5ce1..5d27ef5ce1 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
index 7b74867c03..7b74867c03 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
index ec16a678a3..ec16a678a3 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
index 708d526f44..708d526f44 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
index ed681009f9..ed681009f9 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
index e404ac86b7..e404ac86b7 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
index af0431f048..af0431f048 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
index c86a0f6bcb..c86a0f6bcb 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
index 89b00a36cc..89b00a36cc 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
index 399b0d8175..399b0d8175 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
index ea35bec61a..ea35bec61a 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
index bc8cf35368..bc8cf35368 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
index 57981e3666..57981e3666 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
index da2929776e..da2929776e 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
index ace5427786..ace5427786 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/branches/sca-android/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/branches/sca-android/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
index fa3f310d4d..fa3f310d4d 100644
--- a/branches/sca-android/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/branches/sca-android/itest/databindings/config.png b/sca-java-1.x/branches/sca-android/itest/databindings/config.png
index 7912019e9d..7912019e9d 100644
--- a/branches/sca-android/itest/databindings/config.png
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/config.png
diff --git a/branches/sca-android/itest/databindings/config.svg b/sca-java-1.x/branches/sca-android/itest/databindings/config.svg
index aaf027e2df..aaf027e2df 100644
--- a/branches/sca-android/itest/databindings/config.svg
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/config.svg
diff --git a/branches/sca-android/itest/databindings/databinding.png b/sca-java-1.x/branches/sca-android/itest/databindings/databinding.png
index 76a9c71b7d..76a9c71b7d 100644
--- a/branches/sca-android/itest/databindings/databinding.png
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/databinding.png
diff --git a/branches/sca-android/itest/databindings/databinding.svg b/sca-java-1.x/branches/sca-android/itest/databindings/databinding.svg
index d6850ccf7d..d6850ccf7d 100644
--- a/branches/sca-android/itest/databindings/databinding.svg
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/databinding.svg
diff --git a/branches/sca-android/itest/databindings/interop.png b/sca-java-1.x/branches/sca-android/itest/databindings/interop.png
index 005e0f24ea..005e0f24ea 100644
--- a/branches/sca-android/itest/databindings/interop.png
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/interop.png
diff --git a/branches/sca-android/itest/databindings/interop.svg b/sca-java-1.x/branches/sca-android/itest/databindings/interop.svg
index 03897c6d09..03897c6d09 100644
--- a/branches/sca-android/itest/databindings/interop.svg
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/interop.svg
diff --git a/branches/sca-android/itest/databindings/interop/pom.xml b/sca-java-1.x/branches/sca-android/itest/databindings/interop/pom.xml
index bcd1b12078..bcd1b12078 100644
--- a/branches/sca-android/itest/databindings/interop/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/interop/pom.xml
diff --git a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
index 7bdfc57924..7bdfc57924 100644
--- a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
index 38bfccce0c..38bfccce0c 100644
--- a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
index 6f02af4c9d..6f02af4c9d 100644
--- a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/generate.xml
index 8453dd56b4..8453dd56b4 100644
--- a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
index 36797fde57..36797fde57 100644
--- a/branches/sca-android/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/pom.xml
index 92a8e7d82a..92a8e7d82a 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/pom.xml
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
index 7f9b62f9b4..7f9b62f9b4 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
index 1762812c1f..1762812c1f 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
index 7529c2b841..7529c2b841 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
index 4a4419a42b..4a4419a42b 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
index 65f019ec48..65f019ec48 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
index 844e28863a..844e28863a 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
index 4e0bd38b2b..4e0bd38b2b 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
index 40aff31297..40aff31297 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
index ca012b967d..ca012b967d 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
index 12ed7d0ec7..12ed7d0ec7 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
index 3bae554dc7..3bae554dc7 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
index a31cc3d45a..a31cc3d45a 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
index 34ac9024f6..34ac9024f6 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
index 23ed57dec9..23ed57dec9 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
index 6239c0f5f1..6239c0f5f1 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index c5553688e2..c5553688e2 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3bdf886dfa..3bdf886dfa 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
index 0fdf69459f..0fdf69459f 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 2842205085..2842205085 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 351d9df0cb..351d9df0cb 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
index 8b484e93f0..8b484e93f0 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
index 4a35d41c04..4a35d41c04 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
index 9e042ffe6a..9e042ffe6a 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
index ec929ddece..ec929ddece 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
index 58808eec4f..58808eec4f 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
index 858b8da59a..858b8da59a 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
index 51e48edbc9..51e48edbc9 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
index de52cdfac3..de52cdfac3 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
index 199335c38c..199335c38c 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
index fe9121be9d..fe9121be9d 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index 28ace6aab7..28ace6aab7 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index ab1a3b4ab8..ab1a3b4ab8 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
index 0a8f6772b5..0a8f6772b5 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 626b0e9844..626b0e9844 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 19a6cae01b..19a6cae01b 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 68510b4b03..68510b4b03 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
index 10a242be4d..10a242be4d 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
index 5ecbb9edee..5ecbb9edee 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
index 2d47ba7b14..2d47ba7b14 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
index c39cf21002..c39cf21002 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
index 4b0a6e215d..4b0a6e215d 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
index 13ef73c082..13ef73c082 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
index 4967b896a5..4967b896a5 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
index 744bf20494..744bf20494 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
index c22d00140e..c22d00140e 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
index f8aaad3dac..f8aaad3dac 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
diff --git a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index 4977baa84c..4977baa84c 100644
--- a/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/pom.xml b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/pom.xml
index ae506499d4..ae506499d4 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/pom.xml
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
index 352f805c7d..352f805c7d 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
index 7bd95cec95..7bd95cec95 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index 8c0fb24da9..8c0fb24da9 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3a5a81bae4..3a5a81bae4 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 4be057fe68..4be057fe68 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 0c073cd054..0c073cd054 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
index c4026fdb9a..c4026fdb9a 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
index fc2dc64b7d..fc2dc64b7d 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index ef1a907b29..ef1a907b29 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index e60ae41767..e60ae41767 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 8803eb262a..8803eb262a 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 46569311ff..46569311ff 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 9d851455da..9d851455da 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
index 926e4154aa..926e4154aa 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
index 63151f6a2d..63151f6a2d 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
index f366783e5e..f366783e5e 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
index 85ca6d0789..85ca6d0789 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
index 4788df78e0..4788df78e0 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
index 5bfd1ea277..5bfd1ea277 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index 37a521b1bd..37a521b1bd 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index 65b8a5abc3..65b8a5abc3 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
diff --git a/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index dc49f0f407..dc49f0f407 100644
--- a/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
diff --git a/branches/sca-android/itest/databindings/jaxbgen/pom.xml b/sca-java-1.x/branches/sca-android/itest/databindings/jaxbgen/pom.xml
index 648c16bf75..648c16bf75 100644
--- a/branches/sca-android/itest/databindings/jaxbgen/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxbgen/pom.xml
diff --git a/branches/sca-android/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-android/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
index 8381a164ea..8381a164ea 100644
--- a/branches/sca-android/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-android/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/sca-java-1.x/branches/sca-android/itest/databindings/jaxbgen/src/main/resources/greeter.composite
index ae0740e6fe..ae0740e6fe 100644
--- a/branches/sca-android/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/branches/sca-android/itest/databindings/pom.xml b/sca-java-1.x/branches/sca-android/itest/databindings/pom.xml
index e607d4a6a5..e607d4a6a5 100644
--- a/branches/sca-android/itest/databindings/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/pom.xml
diff --git a/branches/sca-android/itest/databindings/readme.html b/sca-java-1.x/branches/sca-android/itest/databindings/readme.html
index 24a44e4ed7..24a44e4ed7 100644
--- a/branches/sca-android/itest/databindings/readme.html
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/readme.html
diff --git a/branches/sca-android/itest/databindings/sdogen/pom.xml b/sca-java-1.x/branches/sca-android/itest/databindings/sdogen/pom.xml
index bfafd558f8..bfafd558f8 100644
--- a/branches/sca-android/itest/databindings/sdogen/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/sdogen/pom.xml
diff --git a/branches/sca-android/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/sca-java-1.x/branches/sca-android/itest/databindings/sdogen/src/main/resources/generate/generate.xml
index 3f9926604d..3f9926604d 100644
--- a/branches/sca-android/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/branches/sca-android/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/sca-java-1.x/branches/sca-android/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
index 9494d70f96..9494d70f96 100644
--- a/branches/sca-android/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ b/sca-java-1.x/branches/sca-android/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
diff --git a/branches/sca-android/itest/domain/pom.xml b/sca-java-1.x/branches/sca-android/itest/domain/pom.xml
index 930bcda79d..930bcda79d 100644
--- a/branches/sca-android/itest/domain/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/domain/pom.xml
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/AddService.java
index 797ebb4024..797ebb4024 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/AddService.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/AddServiceImpl.java
index 1a63d4ff77..1a63d4ff77 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
index 93486d915e..93486d915e 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/CalculatorService.java
index 2718ab8772..2718ab8772 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
index 3cb255843f..3cb255843f 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/DivideService.java
index ef6a8b375b..ef6a8b375b 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/DivideServiceImpl.java
index 8c33862f6d..8c33862f6d 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/MultiplyService.java
index db568cc762..db568cc762 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
index c7fbc73c00..c7fbc73c00 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/SubtractService.java
index 615320e670..615320e670 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-android/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
index abf2777c7d..abf2777c7d 100644
--- a/branches/sca-android/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionA/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionA/Calculator.composite
index 534e1a29af..534e1a29af 100644
--- a/branches/sca-android/itest/domain/src/main/resources/contributionA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionA/Calculator.composite
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
index 1b1c0291e2..1b1c0291e2 100644
--- a/branches/sca-android/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
index bdb89803d1..bdb89803d1 100644
--- a/branches/sca-android/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
index c5af8dd3cc..c5af8dd3cc 100644
--- a/branches/sca-android/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionDependent/Calculator.composite
index df00387b23..df00387b23 100644
--- a/branches/sca-android/itest/domain/src/main/resources/contributionDependent/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionDependent/Calculator.composite
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
index 8264a8243f..8264a8243f 100644
--- a/branches/sca-android/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
index 92d069c6c9..92d069c6c9 100644
--- a/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
diff --git a/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
index e53c14a651..e53c14a651 100644
--- a/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/sca-java-1.x/branches/sca-android/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
index 98f13df774..98f13df774 100644
--- a/branches/sca-android/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/pom.xml b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/pom.xml
index bdb3784be3..bdb3784be3 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/pom.xml
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 4f4fe50041..4f4fe50041 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 95496e1737..95496e1737 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index 842dd4e602..842dd4e602 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index aba83723bb..aba83723bb 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index ab65efbb58..ab65efbb58 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
index acecdff613..acecdff613 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
index 460edab182..460edab182 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
index 40e87953b6..40e87953b6 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-android/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index fc49fa1d7d..fc49fa1d7d 100644
--- a/branches/sca-android/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding/pom.xml b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/pom.xml
index 3d4a4a3880..3d4a4a3880 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/pom.xml
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
index f5e36db7cd..f5e36db7cd 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
index 65751175fb..65751175fb 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
index 5f65d293ea..5f65d293ea 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
index e84ae633e7..e84ae633e7 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
index 74815dc6c1..74815dc6c1 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
index 5fe40935ec..5fe40935ec 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/MarketClosedSDOException.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
index ab65efbb58..ab65efbb58 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
index 872fd721d1..872fd721d1 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
index 83526cb6a1..83526cb6a1 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
index d70cdad313..d70cdad313 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/wsdl.sdo/StockExceptionTest.wsdl
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
index 33b830c856..33b830c856 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/wsdl/StockExceptionTest.wsdl
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
index 9759647cfe..9759647cfe 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/main/resources/xsd/StockExceptionTest.xsd
diff --git a/branches/sca-android/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
index 3371f63e4a..3371f63e4a 100644
--- a/branches/sca-android/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/pom.xml b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/pom.xml
index bd6646344d..bd6646344d 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/pom.xml
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
index 1b597984e5..1b597984e5 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/BusinessExceptionMinimal.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
index d6545b5a23..d6545b5a23 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
index 987d2107b5..987d2107b5 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleClientMinimalImpl.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
index 30ea559694..30ea559694 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
index b3b6f033e5..b3b6f033e5 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
index aa8591872e..aa8591872e 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimal.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
index 728be51428..728be51428 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/java/com/example/ExampleServiceMinimalImpl.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/resources/example.composite b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/resources/example.composite
index 505132277c..505132277c 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/resources/example.composite
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/resources/example.composite
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
index 628e6ca6ba..628e6ca6ba 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
index 7310a0f1e7..7310a0f1e7 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/test/java/com/example/ExampleMinimalTestCase.java
diff --git a/branches/sca-android/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/branches/sca-android/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions-simple-ws/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-android/itest/exceptions/pom.xml b/sca-java-1.x/branches/sca-android/itest/exceptions/pom.xml
index 43b0956e05..43b0956e05 100644
--- a/branches/sca-android/itest/exceptions/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/pom.xml
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index b95b0ccb31..b95b0ccb31 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 5740e053a9..5740e053a9 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index f923133ee9..f923133ee9 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index 55d81102d2..55d81102d2 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 1987490a0a..1987490a0a 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index c4cb52f94c..c4cb52f94c 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index cf8740ba56..cf8740ba56 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index f82a30d529..f82a30d529 100644
--- a/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/branches/sca-android/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/resources/ExceptionTest.composite
index d27797c2fe..d27797c2fe 100644
--- a/branches/sca-android/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/branches/sca-android/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-1.x/branches/sca-android/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index f84205c096..f84205c096 100644
--- a/branches/sca-android/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/branches/sca-android/itest/extended-api/pom.xml b/sca-java-1.x/branches/sca-android/itest/extended-api/pom.xml
index 26545ef2d3..26545ef2d3 100644
--- a/branches/sca-android/itest/extended-api/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/extended-api/pom.xml
diff --git a/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
index 869565af17..869565af17 100644
--- a/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
+++ b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/BasicService.java
diff --git a/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
index c54af93c05..c54af93c05 100644
--- a/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
+++ b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/MathService.java
diff --git a/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
index 523d238f2e..523d238f2e 100644
--- a/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/BasicServiceImpl.java
diff --git a/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
index ab4300a7dd..ab4300a7dd 100644
--- a/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/java/org/apache/tuscany/sca/test/extended/impl/MathServiceImpl.java
diff --git a/branches/sca-android/itest/extended-api/src/main/resources/BasicService.composite b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/resources/BasicService.composite
index 128b33b16f..128b33b16f 100644
--- a/branches/sca-android/itest/extended-api/src/main/resources/BasicService.composite
+++ b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/resources/BasicService.composite
diff --git a/branches/sca-android/itest/extended-api/src/main/resources/MathService.composite b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/resources/MathService.composite
index 8e99d3da60..8e99d3da60 100644
--- a/branches/sca-android/itest/extended-api/src/main/resources/MathService.composite
+++ b/sca-java-1.x/branches/sca-android/itest/extended-api/src/main/resources/MathService.composite
diff --git a/branches/sca-android/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java b/sca-java-1.x/branches/sca-android/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
index c480235d88..c480235d88 100644
--- a/branches/sca-android/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/extended-api/src/test/java/org/apache/tuscany/sca/test/extended/ServiceLocateTestCase.java
diff --git a/branches/sca-android/itest/interfaces/pom.xml b/sca-java-1.x/branches/sca-android/itest/interfaces/pom.xml
index 65de919e10..65de919e10 100644
--- a/branches/sca-android/itest/interfaces/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/pom.xml
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index 5bc872ef83..5bc872ef83 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 7bfcf5de11..7bfcf5de11 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index d4f7694e8f..d4f7694e8f 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 4772303fab..4772303fab 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index e100636b23..e100636b23 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 0bc8d10904..0bc8d10904 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index e2b70313ed..e2b70313ed 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index dd591eabeb..dd591eabeb 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index d4731f35d3..d4731f35d3 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index 6c40db0e70..6c40db0e70 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 3804d31902..3804d31902 100644
--- a/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/branches/sca-android/itest/interfaces/src/main/resources/InterfacesTest.composite b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/resources/InterfacesTest.composite
index 0361d8c83c..0361d8c83c 100644
--- a/branches/sca-android/itest/interfaces/src/main/resources/InterfacesTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/main/resources/InterfacesTest.composite
diff --git a/branches/sca-android/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-1.x/branches/sca-android/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index 013cdd4f15..013cdd4f15 100644
--- a/branches/sca-android/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-android/itest/interop-soap-client/pom.xml b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/pom.xml
index 2369b8489e..2369b8489e 100644
--- a/branches/sca-android/itest/interop-soap-client/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/pom.xml
diff --git a/branches/sca-android/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
index ffffb96686..ffffb96686 100644
--- a/branches/sca-android/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/src/main/java/org/apache/tuscany/test/interop/client/LoopbackInteropDocServiceComponentImpl.java
diff --git a/branches/sca-android/itest/interop-soap-client/src/main/resources/default.composite b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/src/main/resources/default.composite
index 7fd5cc0d65..7fd5cc0d65 100644
--- a/branches/sca-android/itest/interop-soap-client/src/main/resources/default.composite
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/src/main/resources/default.composite
diff --git a/branches/sca-android/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
index 90d8a754b4..90d8a754b4 100644
--- a/branches/sca-android/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-android/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
index dc1ba48580..dc1ba48580 100644
--- a/branches/sca-android/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-client/src/test/java/org/apache/tuscany/test/interop/client/InteropDocClientTestCase.java
diff --git a/branches/sca-android/itest/interop-soap-round2-client/pom.xml b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/pom.xml
index 9ac6661a5e..9ac6661a5e 100644
--- a/branches/sca-android/itest/interop-soap-round2-client/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/pom.xml
diff --git a/branches/sca-android/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
index ca3031c646..ca3031c646 100644
--- a/branches/sca-android/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/src/main/java/org/apache/tuscany/test/interop/client/InteropTestDocLit.java
diff --git a/branches/sca-android/itest/interop-soap-round2-client/src/main/resources/default.composite b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/src/main/resources/default.composite
index 9bde77ef37..9bde77ef37 100644
--- a/branches/sca-android/itest/interop-soap-round2-client/src/main/resources/default.composite
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/src/main/resources/default.composite
diff --git a/branches/sca-android/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
index e08039cedb..e08039cedb 100644
--- a/branches/sca-android/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/src/main/resources/wsdl/interoptestdoclit.wsdl
diff --git a/branches/sca-android/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
index bb379c89cd..bb379c89cd 100644
--- a/branches/sca-android/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-round2-client/src/test/java/org/apache/tuscany/test/interop/client/InteropTestDocLitTestCase.java
diff --git a/branches/sca-android/itest/interop-soap-service/pom.xml b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/pom.xml
index 76285e3926..76285e3926 100644
--- a/branches/sca-android/itest/interop-soap-service/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/pom.xml
diff --git a/branches/sca-android/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
index c34941f43e..c34941f43e 100644
--- a/branches/sca-android/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/src/main/java/org/apache/tuscany/test/interop/server/InteropDocServiceComponentImpl.java
diff --git a/branches/sca-android/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
index 820c26ca34..820c26ca34 100644
--- a/branches/sca-android/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/src/main/resources/wsdl/interopdoc.wsdl
diff --git a/branches/sca-android/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
index 3fbc73616e..3fbc73616e 100644
--- a/branches/sca-android/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/src/main/webapp/META-INF/sca/default.scdl
diff --git a/branches/sca-android/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
index 8cf95fb789..8cf95fb789 100644
--- a/branches/sca-android/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-android/itest/interop-soap-service/t.bat b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/t.bat
index 0f83dedc37..0f83dedc37 100755
--- a/branches/sca-android/itest/interop-soap-service/t.bat
+++ b/sca-java-1.x/branches/sca-android/itest/interop-soap-service/t.bat
diff --git a/branches/sca-android/itest/jms-args/pom.xml b/sca-java-1.x/branches/sca-android/itest/jms-args/pom.xml
index 32ad3099c6..32ad3099c6 100644
--- a/branches/sca-android/itest/jms-args/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/jms-args/pom.xml
diff --git a/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 51ce5f4f24..51ce5f4f24 100644
--- a/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 487e5f2cbb..487e5f2cbb 100644
--- a/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/branches/sca-android/itest/jms-args/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-android/itest/jms-args/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/resources/jndi.properties
diff --git a/branches/sca-android/itest/jms-args/src/main/resources/selectors/selectors.composite b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/resources/selectors/selectors.composite
index 74c352934f..74c352934f 100644
--- a/branches/sca-android/itest/jms-args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms-args/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-android/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 228366d596..228366d596 100644
--- a/branches/sca-android/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/branches/sca-android/itest/jms-callbacks/pom.xml b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/pom.xml
index 1dd26c7a41..1dd26c7a41 100644
--- a/branches/sca-android/itest/jms-callbacks/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/pom.xml
diff --git a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index 9d75685a8a..9d75685a8a 100644
--- a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index 9c2c657b55..9c2c657b55 100644
--- a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 5697d819c7..5697d819c7 100644
--- a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index b15b40c8a6..b15b40c8a6 100644
--- a/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/branches/sca-android/itest/jms-callbacks/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/resources/jndi.properties
index 608fe747f5..608fe747f5 100644
--- a/branches/sca-android/itest/jms-callbacks/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/resources/jndi.properties
diff --git a/branches/sca-android/itest/jms-callbacks/src/main/resources/simple/client.composite b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/resources/simple/client.composite
index 93d8acb65b..93d8acb65b 100644
--- a/branches/sca-android/itest/jms-callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/resources/simple/client.composite
diff --git a/branches/sca-android/itest/jms-callbacks/src/main/resources/simple/tempq.composite b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/resources/simple/tempq.composite
index 636e951d03..636e951d03 100644
--- a/branches/sca-android/itest/jms-callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/main/resources/simple/tempq.composite
diff --git a/branches/sca-android/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index cb9acb1bc1..cb9acb1bc1 100644
--- a/branches/sca-android/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/branches/sca-android/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 9f450574df..9f450574df 100644
--- a/branches/sca-android/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/branches/sca-android/itest/jms-definitions/pom.xml b/sca-java-1.x/branches/sca-android/itest/jms-definitions/pom.xml
index a142978fde..a142978fde 100644
--- a/branches/sca-android/itest/jms-definitions/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/jms-definitions/pom.xml
diff --git a/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 4d00d2df0d..4d00d2df0d 100644
--- a/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 377f227ceb..377f227ceb 100644
--- a/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-android/itest/jms-definitions/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/resources/definitions.xml
index ff389c7014..ff389c7014 100644
--- a/branches/sca-android/itest/jms-definitions/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/resources/definitions.xml
diff --git a/branches/sca-android/itest/jms-definitions/src/main/resources/definitions/definitions.composite b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/resources/definitions/definitions.composite
index 99e4e5016e..99e4e5016e 100644
--- a/branches/sca-android/itest/jms-definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/resources/definitions/definitions.composite
diff --git a/branches/sca-android/itest/jms-definitions/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/resources/jndi.properties
index f7555e0beb..f7555e0beb 100644
--- a/branches/sca-android/itest/jms-definitions/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/main/resources/jndi.properties
diff --git a/branches/sca-android/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 9de3bff7c3..9de3bff7c3 100644
--- a/branches/sca-android/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/branches/sca-android/itest/jms-selectors/pom.xml b/sca-java-1.x/branches/sca-android/itest/jms-selectors/pom.xml
index 2a39634927..2a39634927 100644
--- a/branches/sca-android/itest/jms-selectors/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/pom.xml
diff --git a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 0ad6440593..0ad6440593 100644
--- a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index f26a3ce68b..f26a3ce68b 100644
--- a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/branches/sca-android/itest/jms-selectors/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/resources/jndi.properties
index bb431a592b..bb431a592b 100644
--- a/branches/sca-android/itest/jms-selectors/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/resources/jndi.properties
diff --git a/branches/sca-android/itest/jms-selectors/src/main/resources/selectors/selectors.composite b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/resources/selectors/selectors.composite
index 83fb50531b..83fb50531b 100644
--- a/branches/sca-android/itest/jms-selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/main/resources/selectors/selectors.composite
diff --git a/branches/sca-android/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index ea548c22e6..ea548c22e6 100644
--- a/branches/sca-android/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms-selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/branches/sca-android/itest/jms/pom.xml b/sca-java-1.x/branches/sca-android/itest/jms/pom.xml
index 0630174ace..0630174ace 100644
--- a/branches/sca-android/itest/jms/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/jms/pom.xml
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 7b1c63d437..7b1c63d437 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 46bf911def..46bf911def 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index cd3c09e17f..cd3c09e17f 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index ab293a5df1..ab293a5df1 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 86d4719646..86d4719646 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index abb29aec4c..abb29aec4c 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 21d2de2cf0..21d2de2cf0 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index b4d1cbccda..b4d1cbccda 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index e8242467cc..e8242467cc 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d376d74295..d376d74295 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index 142343e349..142343e349 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 218cccf64c..218cccf64c 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9795089952..9795089952 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 25a89fc5b4..25a89fc5b4 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index f16f853ba7..f16f853ba7 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index bff4536fa0..bff4536fa0 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
index cfe7a649d9..cfe7a649d9 100644
--- a/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
diff --git a/branches/sca-android/itest/jms/src/main/resources/defaults/client.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/defaults/client.composite
index 991b0cf11b..991b0cf11b 100644
--- a/branches/sca-android/itest/jms/src/main/resources/defaults/client.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/defaults/client.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/defaults/service.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/defaults/service.composite
index 3f299bc787..3f299bc787 100644
--- a/branches/sca-android/itest/jms/src/main/resources/defaults/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/defaults/service.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/dynamic/client.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/dynamic/client.composite
index afa4135f1d..afa4135f1d 100644
--- a/branches/sca-android/itest/jms/src/main/resources/dynamic/client.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/dynamic/client.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/exceptions/client.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/exceptions/client.composite
index 8bb7f86252..8bb7f86252 100644
--- a/branches/sca-android/itest/jms/src/main/resources/exceptions/client.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/exceptions/client.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/exceptions/service.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/exceptions/service.composite
index 052ff9d985..052ff9d985 100644
--- a/branches/sca-android/itest/jms/src/main/resources/exceptions/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/exceptions/service.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/external/client.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/external/client.composite
index 7a0013be4d..7a0013be4d 100644
--- a/branches/sca-android/itest/jms/src/main/resources/external/client.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/external/client.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/external/service.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/external/service.composite
index b9f33e5afc..b9f33e5afc 100644
--- a/branches/sca-android/itest/jms/src/main/resources/external/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/external/service.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-android/itest/jms/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/jndi.properties
diff --git a/branches/sca-android/itest/jms/src/main/resources/nonSCAclient/service.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/nonSCAclient/service.composite
index 1baa4af6b4..1baa4af6b4 100644
--- a/branches/sca-android/itest/jms/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/nonSCAclient/service.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/oneway/OneWayClient.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/oneway/OneWayClient.composite
index bed0663f58..bed0663f58 100644
--- a/branches/sca-android/itest/jms/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/oneway/OneWayClient.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/oneway/OneWayService.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/oneway/OneWayService.composite
index 3d08de7d51..3d08de7d51 100644
--- a/branches/sca-android/itest/jms/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/oneway/OneWayService.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/properties/properties.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/properties/properties.composite
index 43bd611b24..43bd611b24 100644
--- a/branches/sca-android/itest/jms/src/main/resources/properties/properties.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/properties/properties.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/simple/client.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/simple/client.composite
index 3e16e794cb..3e16e794cb 100644
--- a/branches/sca-android/itest/jms/src/main/resources/simple/client.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/simple/client.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/simple/mpclient.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/simple/mpclient.composite
index 69c0ef305e..69c0ef305e 100644
--- a/branches/sca-android/itest/jms/src/main/resources/simple/mpclient.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/simple/mpclient.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/simple/service.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/simple/service.composite
index 2ab92923f6..2ab92923f6 100644
--- a/branches/sca-android/itest/jms/src/main/resources/simple/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/simple/service.composite
diff --git a/branches/sca-android/itest/jms/src/main/resources/simple/uriclient.composite b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/simple/uriclient.composite
index 83ef9c3c95..83ef9c3c95 100644
--- a/branches/sca-android/itest/jms/src/main/resources/simple/uriclient.composite
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/main/resources/simple/uriclient.composite
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index dca9386637..dca9386637 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index f4750e5453..f4750e5453 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index ba3e697e13..ba3e697e13 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index c34ad07901..c34ad07901 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
index 9ec77ca440..9ec77ca440 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index 55e5a84c1c..55e5a84c1c 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 26dda13cf9..26dda13cf9 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index 4cc229422e..4cc229422e 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index c1882a1e26..c1882a1e26 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index bed5515d7f..bed5515d7f 100644
--- a/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/branches/sca-android/itest/large-sdo-ws/pom.xml b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/pom.xml
index 64aba086cb..64aba086cb 100644
--- a/branches/sca-android/itest/large-sdo-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/pom.xml
diff --git a/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
index f5a8830c4a..f5a8830c4a 100644
--- a/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqClient.java
diff --git a/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
index 14da53cf98..14da53cf98 100644
--- a/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrnInqService.java
diff --git a/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
index 3575d94f48..3575d94f48 100644
--- a/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/java/org/apache/tuscany/sca/itest/trninq/TrninqInterface.java
diff --git a/branches/sca-android/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
index ac66b6a425..ac66b6a425 100644
--- a/branches/sca-android/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/large-sdo-ws/src/main/resources/trnInq.composite b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/resources/trnInq.composite
index 97594216e1..97594216e1 100644
--- a/branches/sca-android/itest/large-sdo-ws/src/main/resources/trnInq.composite
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/resources/trnInq.composite
diff --git a/branches/sca-android/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
index b85b80abc4..b85b80abc4 100644
--- a/branches/sca-android/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/resources/wsdl/IFX170_XSD.xsd
diff --git a/branches/sca-android/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
index 842f7a9d4c..842f7a9d4c 100644
--- a/branches/sca-android/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/main/resources/wsdl/trninq.wsdl
diff --git a/branches/sca-android/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
index 17eb575d50..17eb575d50 100644
--- a/branches/sca-android/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/large-sdo-ws/src/test/java/trninq/TrnInqServiceTestCase.java
diff --git a/branches/sca-android/itest/late-reference-resolution/pom.xml b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/pom.xml
index f30931f309..f30931f309 100644
--- a/branches/sca-android/itest/late-reference-resolution/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/pom.xml
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/AddService.java
index d7dc4473ad..d7dc4473ad 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/AddService.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
index e9b7e254e5..e9b7e254e5 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
index da869e00fd..da869e00fd 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
index 78ab9c6ee0..78ab9c6ee0 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
index 1010207154..1010207154 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index c53b55aacf..c53b55aacf 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
index 378d6e9706..378d6e9706 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeA/Calculator.composite
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
index db255e0232..db255e0232 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
index 3fb16fa619..3fb16fa619 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeB/Calculator.composite
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
index 130157ac04..130157ac04 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
index c615b4355a..c615b4355a 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeC/Calculator.composite
diff --git a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
index cba0a5c281..cba0a5c281 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
index e4bd3035e2..e4bd3035e2 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverFactoryImpl.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
index c6e0689837..c6e0689837 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/test/java/binding/sca/BindingScaEndpointResolverImpl.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
index ebe834028d..ebe834028d 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/test/java/calculator/LateReferenceResolutionTestCase.java
diff --git a/branches/sca-android/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
index 57afc9ea50..57afc9ea50 100644
--- a/branches/sca-android/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/late-reference-resolution/src/test/java/calculator/TestRegistryImpl.java
diff --git a/branches/sca-android/itest/oneway/build.xml b/sca-java-1.x/branches/sca-android/itest/oneway/build.xml
index e6b8f2e51f..e6b8f2e51f 100644
--- a/branches/sca-android/itest/oneway/build.xml
+++ b/sca-java-1.x/branches/sca-android/itest/oneway/build.xml
diff --git a/branches/sca-android/itest/oneway/pom.xml b/sca-java-1.x/branches/sca-android/itest/oneway/pom.xml
index ba61e1e0c0..ba61e1e0c0 100644
--- a/branches/sca-android/itest/oneway/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/oneway/pom.xml
diff --git a/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
index 04c6069dfe..04c6069dfe 100644
--- a/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
diff --git a/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
index b3cec51b1f..b3cec51b1f 100644
--- a/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
+++ b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
diff --git a/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
index 8013c5c0e8..8013c5c0e8 100644
--- a/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
diff --git a/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
index 01f956cb67..01f956cb67 100644
--- a/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
diff --git a/branches/sca-android/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
index d053a6278c..d053a6278c 100644
--- a/branches/sca-android/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ b/sca-java-1.x/branches/sca-android/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
diff --git a/branches/sca-android/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-1.x/branches/sca-android/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index c490150ec5..c490150ec5 100644
--- a/branches/sca-android/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
diff --git a/branches/sca-android/itest/operation-overloading/pom.xml b/sca-java-1.x/branches/sca-android/itest/operation-overloading/pom.xml
index 2f28908e6b..2f28908e6b 100644
--- a/branches/sca-android/itest/operation-overloading/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/operation-overloading/pom.xml
diff --git a/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 85b5717c00..85b5717c00 100644
--- a/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index e5d5083a2d..e5d5083a2d 100644
--- a/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index e206a86768..e206a86768 100644
--- a/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/branches/sca-android/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/branches/sca-android/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/branches/sca-android/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 0b3b12c762..0b3b12c762 100644
--- a/branches/sca-android/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/build-bundles.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml
index edbb66ab09..edbb66ab09 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/pom.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
index fba9a109b3..fba9a109b3 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 2b8c973e2c..2b8c973e2c 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index cc5d44d279..cc5d44d279 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 2d1bb68e5b..2d1bb68e5b 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index c39a34cb96..c39a34cb96 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 0ba54b363a..0ba54b363a 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/Customer2V2.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/CustomerV2.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
index 4779eff514..4779eff514 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
index d505834f15..d505834f15 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
index 6bcf6cef0a..6bcf6cef0a 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
index e23e1a2ecd..e23e1a2ecd 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
index 9832da880e..9832da880e 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/RetailerV2.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
index 5586179421..5586179421 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/ShipperV2.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/WarehouseV2.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
index 644b207e70..644b207e70 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
index e649870356..e649870356 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
index 8e8e33ecd1..8e8e33ecd1 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
index 2f4b56835b..2f4b56835b 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
index 5f4a8b94ec..5f4a8b94ec 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
index 57d2ac9e4d..57d2ac9e4d 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
index 2e1399bb3b..2e1399bb3b 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
index bb8fb2b07c..bb8fb2b07c 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes-v2/src/main/resources/supplychain.composite
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml
index 82d536cbfe..82d536cbfe 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/build-bundles.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml
index 0a95927b7f..0a95927b7f 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/pom.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
index fba9a109b3..fba9a109b3 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
index 225dce0236..225dce0236 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index d0b0a13e6d..d0b0a13e6d 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a1c7fce60a..a1c7fce60a 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 4647a716c7..4647a716c7 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index d2bf71ed28..d2bf71ed28 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index 1b7fb15bf1..1b7fb15bf1 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e97331c06c..e97331c06c 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index 2556a0cfa0..2556a0cfa0 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index 0f88cca213..0f88cca213 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index f55a068ede..f55a068ede 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index e180c37e3f..e180c37e3f 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 600f3f0c74..600f3f0c74 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index 0ba54b363a..0ba54b363a 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/Customer2V1.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
index 7edc392f46..7edc392f46 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/CustomerV1.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
index 828dc6f472..828dc6f472 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
index 9293b1ff52..9293b1ff52 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
index 03077aa4d4..03077aa4d4 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
index 210a68011f..210a68011f 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
index c96deb4e1b..c96deb4e1b 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
index 9832da880e..9832da880e 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/RetailerV1.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
index 5586179421..5586179421 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/ShipperV1.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
index ccc4f84ee4..ccc4f84ee4 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/WarehouseV1.componentType
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
index 404995a90f..404995a90f 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
index 0441e8c6f0..0441e8c6f0 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Customer2.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
index ac0ca72030..ac0ca72030 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
index 2f4b56835b..2f4b56835b 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/RetailerJar.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
index 61f62fa16e..61f62fa16e 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
index dc4aa2c30e..dc4aa2c30e 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/SupplyChain.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
index d149165366..d149165366 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/osgi/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
index 4a18aed5f3..4a18aed5f3 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-classes/src/main/resources/supplychain.composite
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml
index 6853aba2d1..6853aba2d1 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/pom.xml
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
index 108481fcbd..108481fcbd 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/main/java/org/apache/tuscany/sca/contribution/osgi/OSGiTestUtil.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
index 28fe368663..28fe368663 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/MixedContributionTestCase.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
index be3b7365e5..be3b7365e5 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/NestedBundleTestCase.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
index 03372349f8..03372349f8 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/OSGiResolverTestCase.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
index a2b3a7bc92..a2b3a7bc92 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/java/org/apache/tuscany/sca/contribution/osgi/test/SCAResolverTestCase.java
diff --git a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
index ea8d272a0c..ea8d272a0c 100644
--- a/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-android/itest/osgi-contribution/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/pom.xml
index 22a677925e..22a677925e 100644
--- a/branches/sca-android/itest/osgi-contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-contribution/pom.xml
diff --git a/branches/sca-android/itest/osgi-implementation/build-bundles.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/build-bundles.xml
index 53bf014546..53bf014546 100644
--- a/branches/sca-android/itest/osgi-implementation/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/build-bundles.xml
diff --git a/branches/sca-android/itest/osgi-implementation/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/pom.xml
index d9249b6b9f..d9249b6b9f 100644
--- a/branches/sca-android/itest/osgi-implementation/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/pom.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
index cfecd989fe..cfecd989fe 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
index 43bc26f2f5..43bc26f2f5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
index f78878ef47..f78878ef47 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
index 1c65ca573b..1c65ca573b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
index 5383e1e268..5383e1e268 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
index b2af2fa68d..b2af2fa68d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
index c05a3f52a8..c05a3f52a8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
index c92f078e49..c92f078e49 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalCallback.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
index af269052c7..af269052c7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClient.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
index 5eb16be597..5eb16be597 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientActivator.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
index 8479624546..8479624546 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientServiceFactory.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
index 3aedabc29c..3aedabc29c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatefulImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
index b12e094bc1..b12e094bc1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/client/ConversationalClientStatelessImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
index 59e128b993..59e128b993 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClient.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
index ff6f16cba3..ff6f16cba3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientActivator.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
index 4524c6bd3d..4524c6bd3d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/referenceclient/ConversationalReferenceClientImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
index bcd24ef0b1..bcd24ef0b1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalService.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
index 903f8bf229..903f8bf229 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceActivator.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
index fe8bd23f07..fe8bd23f07 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceFactory.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
index ec30d641ac..ec30d641ac 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatefulImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
index 34baca71d1..34baca71d1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/conversation/service/ConversationalServiceStatelessImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/Greetings.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
index 9285c0a8d5..9285c0a8d5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/Greetings.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
index 16d0eae990..16d0eae990 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/HelloWorld.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
index 3d0e045225..3d0e045225 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaGreetingsComponent.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
index c055aee142..c055aee142 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/JavaHelloWorldComponent.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
index 661eb5a8cb..661eb5a8cb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiGreetingsImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
index 0588da9a85..0588da9a85 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/OSGiHelloWorldImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
index fff67e1978..fff67e1978 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldService.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
index 98085449e6..98085449e6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/HelloWorldServiceComponent.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
index 5089019671..5089019671 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClient.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
index 1aabf4d10c..1aabf4d10c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/sdo/client/HelloWorldClientComponent.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
index 039a214856..039a214856 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorld.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
index 4a3cd4aed2..4a3cd4aed2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/helloworld/ws/HelloWorldService.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
index 2251bf5be6..2251bf5be6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
index e2d25bf47d..e2d25bf47d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteFactoryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
index f2ae804ad1..f2ae804ad1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/OSGiStockQuoteImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
index a47f68c579..a47f68c579 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/stockquote/StockQuote.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
index 25d7bcf2ff..25d7bcf2ff 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/OSGiBundleImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
index 2762bc62be..2762bc62be 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 80346311b1..80346311b1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
index a879505610..a879505610 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
index c8cb522cf4..c8cb522cf4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerFactoryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
index 546971860e..546971860e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
index 593e55f3f5..593e55f3f5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
index 18483817ad..18483817ad 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
index 5ba42780f2..5ba42780f2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
index bc569d0ac0..bc569d0ac0 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiStatelessCustomerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
index 599ab51a50..599ab51a50 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index df52c6c760..df52c6c760 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
index aca5943552..aca5943552 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
index e71c624f49..e71c624f49 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
index a036ecfc76..a036ecfc76 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
index db877bb366..db877bb366 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
index ee1f575e70..ee1f575e70 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiRetailerWithQueryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
index 09e60ca626..09e60ca626 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
index 7dd70889c7..7dd70889c7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/OSGiVersionedRetailerServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
index 1e87d59af1..1e87d59af1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
index 354f40a064..354f40a064 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/retailer/RetailerQuery.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index d0cf43a960..d0cf43a960 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
index ff40a7ae36..ff40a7ae36 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
index ef989d6fcf..ef989d6fcf 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperFactoryImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
index effae8c246..effae8c246 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
index 4effadf208..4effadf208 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiShipperServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
index 13bce67bb4..13bce67bb4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
index 071a131f40..071a131f40 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiStatelessShipperServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
index 6ebd1f2894..6ebd1f2894 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
index b66961b1c2..b66961b1c2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/OSGiVersionedShipperServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
index 2514928c10..2514928c10 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index 9edf3567e5..9edf3567e5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
index 659f16be7f..659f16be7f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/JavaWarehouseWithQueryComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
index 7c9e102fd2..7c9e102fd2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
index bb04ff42e0..bb04ff42e0 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
index 3317816557..3317816557 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/OSGiWarehouseServiceImpl.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
index 6f1f6b8730..6f1f6b8730 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
index 6d1ad76796..6d1ad76796 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/java/supplychain/warehouse/WarehouseQuery.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
index 71e248590b..71e248590b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackClient.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
index 7c1125bbb5..7c1125bbb5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/CallbackService.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
index 8456b878f2..8456b878f2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test1.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
index d5a47c6403..d5a47c6403 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test2.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
index e6391d2159..e6391d2159 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/callback/callback-test3.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
index c79ede815b..c79ede815b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalClient.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
index 04cc73b85c..04cc73b85c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalReferenceClient.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
index 9ece700efe..9ece700efe 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/ConversationalService.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
index 52bc43478d..52bc43478d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/conversation/conversation-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
index 0b8d2e5851..0b8d2e5851 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/ds/factory-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/factory-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
index 87370a6df4..87370a6df4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/factory/factory-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
index 127349eacf..127349eacf 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/Greetings.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
index 7e3810c458..7e3810c458 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/helloworld/HelloWorld.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
index fb9a112d18..fb9a112d18 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
index ee732b5efc..ee732b5efc 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
index b1723660d7..b1723660d7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
index 5172cbe21e..5172cbe21e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/ds/interfaces-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
index b7591e732d..b7591e732d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/interfaces/interfaces-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
index cf8717fcf5..cf8717fcf5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackClient.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
index 785212fa6d..785212fa6d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/callback/CallbackService.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
index 7a06030e32..7a06030e32 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalClient.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
index 5c39b53b0a..5c39b53b0a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalReferenceClient.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
index b8bb809319..b8bb809319 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/conversation/ConversationalService.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
index 26f32fe617..26f32fe617 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
index 1b9e0e847e..1b9e0e847e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
index 6066a38f29..6066a38f29 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
index 777edd3f7d..777edd3f7d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
index d8adaa2ba3..d8adaa2ba3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Customer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
index e0bd9d8c10..e0bd9d8c10 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
index 6005ae785c..6005ae785c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
index 6f0b79ebc2..6f0b79ebc2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Retailer2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
index d4b461460e..d4b461460e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
index bb15e6e3aa..bb15e6e3aa 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
index 7591201b8c..7591201b8c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Shipper2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
index 0e844fab99..0e844fab99 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
index fc86a76784..fc86a76784 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/factory/ds/Warehouse.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
index a8a87c5c8c..a8a87c5c8c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
index 05bbf4db88..05bbf4db88 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
index a12d1a21ea..a12d1a21ea 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
index 2214db11a6..2214db11a6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
index 8d44067992..8d44067992 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Customer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
index 60c0fb3fd3..60c0fb3fd3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
index ca1392d2b8..ca1392d2b8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Retailer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
index 7c9f67c36d..7c9f67c36d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
index 760c761666..760c761666 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/interfaces/ds/Shipper.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
index 7d56770311..7d56770311 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/passbyref/Greetings.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
index 321bdc713f..321bdc713f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ManagedStockQuoteFactory.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
index 66f98011cb..66f98011cb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuote.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
index 6874a66db9..6874a66db9 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/StockQuoteFactory.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
index 47d290eb1a..47d290eb1a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
index c7f13a50a7..c7f13a50a7 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuote.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
index f4c102c4f0..f4c102c4f0 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
index cbebf7eec2..cbebf7eec2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/properties/ds/StockQuoteFactory.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
index 6a3c845cca..6a3c845cca 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
index cb6345432f..cb6345432f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldClient.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
index 89871fa8f6..89871fa8f6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
index d968d1ffc5..d968d1ffc5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/sdo/ds/HelloWorldService.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
index fc762df8d5..fc762df8d5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
index 02e42bc010..02e42bc010 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
index 390367b99b..390367b99b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
index 4715cbd976..4715cbd976 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
index 932fb8a483..932fb8a483 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Customer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
index c799f31606..c799f31606 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
index db68d7e333..db68d7e333 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
index 1aea3cf669..1aea3cf669 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Retailer2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
index 106bd1b6aa..106bd1b6aa 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
index 1e3c915a59..1e3c915a59 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Shipper2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
index 81c51e6804..81c51e6804 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/services/ds/Warehouse2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
index 335bc419c1..335bc419c1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
index a68b9d6dbb..a68b9d6dbb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Customer2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
index 02f79c15f3..02f79c15f3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
index 8428b08d96..8428b08d96 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Retailer2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
index c81bf00d00..c81bf00d00 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
index 61c161617c..61c161617c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Shipper2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
index fd6a26a65f..fd6a26a65f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
index 0168bc2435..0168bc2435 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/Warehouse2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
index 6674cdd7f2..6674cdd7f2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
index 72df35ef41..72df35ef41 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Customer2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
index 724c8132df..724c8132df 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
index 1e5035d949..1e5035d949 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/CustomerV2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
index 85bfd86422..85bfd86422 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
index 6e51b3d6f2..6e51b3d6f2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
index 9a87758ec2..9a87758ec2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer1V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
index e134bd1061..e134bd1061 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
index c19895bab1..c19895bab1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
index 707609d2c4..707609d2c4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Retailer2V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
index e084e5831a..e084e5831a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
index d96f6481fb..d96f6481fb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
index 10ef690c9b..10ef690c9b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper1V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
index 003f9dca5a..003f9dca5a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
index fefdea106d..fefdea106d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
index f6b847ed59..f6b847ed59 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Shipper2V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
index 5cff2f573e..5cff2f573e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse1V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
index 0fec68a725..0fec68a725 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
index ca50b554df..ca50b554df 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
index 14658127f8..14658127f8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/version/ds/Warehouse2V2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
index 678014d48d..678014d48d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
index f0090fb52b..f0090fb52b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
index 0b50923a05..0b50923a05 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
index 1000a5f974..1000a5f974 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
index 4e392a9ff1..4e392a9ff1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
index b10d0416dc..b10d0416dc 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Customer.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
index 788ec4f19a..788ec4f19a 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
index 1ba16d0693..1ba16d0693 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
index a55ebd02a8..a55ebd02a8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Retailer2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
index e7459360e6..e7459360e6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
index d518ecab62..d518ecab62 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
index d7d0b41f5e..d7d0b41f5e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Shipper2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
index 880304187b..880304187b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
index d72db04425..d72db04425 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse1.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
index f9c1218f82..f9c1218f82 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/wiring/ds/Warehouse2.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
index d8e4c1cb7e..d8e4c1cb7e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/osgi/ws/HelloWorld.mf
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
index a6de268bf6..a6de268bf6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/Greetings.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
index 660e277693..660e277693 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/passbyref/passbyref-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuote.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/StockQuoteFactory.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuote.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
index 5e0965d047..5e0965d047 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/StockQuoteFactory.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
index 02ae93aec2..02ae93aec2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
index c94504f07d..c94504f07d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/ds/properties2-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
index fea03404fd..fea03404fd 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
index 3c425fcbc9..3c425fcbc9 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/properties/properties2-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
index f6c04de980..f6c04de980 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldClient.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
index 87918132e6..87918132e6 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/HelloWorldService.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
index 9b00787162..9b00787162 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
index 2ecc0bea43..2ecc0bea43 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworld.wsdl
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
index af79dc4bdf..af79dc4bdf 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/sdo/ds/helloworldsdo.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
index c144a1bc18..c144a1bc18 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/ds/services-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/services-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/services-test.composite
index 64f3b30f88..64f3b30f88 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/services/services-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/services/services-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
index 0b0aa0912b..0b0aa0912b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/stockquote/StockQuote.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Customer2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Retailer2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Shipper2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/Warehouse2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
index 7bcdc6a2bb..7bcdc6a2bb 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Customer2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
index eadb539ea5..eadb539ea5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Retailer2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
index 532293b03f..532293b03f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Shipper2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse1.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/Warehouse2.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
index 877d0de1c9..877d0de1c9 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/ds/version-ds-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/version-test.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/version-test.composite
index bbb397ee70..bbb397ee70 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/version/version-test.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/version/version-test.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
index 1fd551be3b..1fd551be3b 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Customer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
index 5599c44bc3..5599c44bc3 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Retailer.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
index 8743f8c145..8743f8c145 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Shipper.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
index d349edf265..d349edf265 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/Warehouse.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
index 617200d8dd..617200d8dd 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test1.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
index 213cde2c1d..213cde2c1d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/ds/wiring-ds-test2.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
index 0dca0da75e..0dca0da75e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test1.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
index 953045fefa..953045fefa 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/wiring/wiring-test2.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
index c621d9aca0..c621d9aca0 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/HelloWorld.componentType
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
index 6d3f853382..6d3f853382 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/helloworld.wsdl
diff --git a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
index d545c844d2..d545c844d2 100644
--- a/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/main/resources/ws/ws-helloworld.composite
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
index 54b9b00bc8..54b9b00bc8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback1TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
index b26bfbd98d..b26bfbd98d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
index 667df7aa12..667df7aa12 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/Callback3TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
index a95437f8c1..a95437f8c1 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/callback/CallbackTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
index c5d94df93d..c5d94df93d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/conversation/ConversationTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
index d340923938..d340923938 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/passbyref/PassByRefTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
index c1f11d0b6e..c1f11d0b6e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/sdo/SdoTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
index 49afb3d8e8..49afb3d8e8 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/helloworld/ws/HelloWorldTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
index a858c18a90..a858c18a90 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/SupplyChainTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
index a9941aebcd..a9941aebcd 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/VersionedSupplyChainTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
index 8e939b1a83..8e939b1a83 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/DSFactoryTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
index 39d90bb75c..39d90bb75c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/factory/FactoryTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
index 5376687b61..5376687b61 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/DSInterfacesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
index 6d8dc1021e..6d8dc1021e 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/interfaces/InterfacesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
index e037ae9675..e037ae9675 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSProperties2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
index eecf67913d..eecf67913d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/DSPropertiesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
index 203bf5123c..203bf5123c 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/Properties2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
index 429b1f10ef..429b1f10ef 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/properties/PropertiesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
index dbc980f8c4..dbc980f8c4 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/DSServicesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
index e39295a402..e39295a402 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/services/ServicesTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
index c2f6bff4f5..c2f6bff4f5 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/DSVersionTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
index 17ba7a2f14..17ba7a2f14 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/version/VersionTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
index 8c33720018..8c33720018 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring1TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
index 0c6edd6691..0c6edd6691 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/DSWiring2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
index 0b48ac90ba..0b48ac90ba 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring1TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
index c84741f34f..c84741f34f 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/supplychain/wiring/Wiring2TestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
index 5a9b2a8b1d..5a9b2a8b1d 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/test/OSGiTestCase.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
index 7b95c12038..7b95c12038 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/java/util/OSGiTestUtil.java
diff --git a/branches/sca-android/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
index 8399991503..8399991503 100644
--- a/branches/sca-android/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
index fa1ace68ac..fa1ace68ac 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/pom.xml
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
index 2e3137239e..2e3137239e 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
index 0dafffdb8c..0dafffdb8c 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
index 6356718fe5..6356718fe5 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
index c9f77b71cf..c9f77b71cf 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
index 1fba0d6dcd..1fba0d6dcd 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
index 8bf7a1fb2f..8bf7a1fb2f 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyNonOSGiTestHarness.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
index ba9b7007b4..ba9b7007b4 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
index 85397195bd..85397195bd 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
index 9346fb8ed2..9346fb8ed2 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
index 501cded48d..501cded48d 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
index 687335b3c4..687335b3c4 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
index f605e024ba..f605e024ba 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
index 4f5640960b..4f5640960b 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
index 9a491304bf..9a491304bf 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
index 2e0b49e693..2e0b49e693 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
index eac9979f56..eac9979f56 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
index 62c0eef16d..62c0eef16d 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
index 155dd368a3..155dd368a3 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
index b45c062761..b45c062761 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
index c2dae9eb97..c2dae9eb97 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
index 8985947286..8985947286 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
index 6a38f48c4a..6a38f48c4a 100644
--- a/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
diff --git a/branches/sca-android/itest/osgi-tuscany/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/pom.xml
index 0da4f09d61..0da4f09d61 100644
--- a/branches/sca-android/itest/osgi-tuscany/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/pom.xml
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/build-bundles.xml b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/build-bundles.xml
index c7ea66863f..c7ea66863f 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/build-bundles.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/build-bundles.xml
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/pom.xml
index b53beea930..b53beea930 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/pom.xml
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
index 0ac96b35a3..0ac96b35a3 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/client/SupplyChainClient.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
index a3aa2531fc..a3aa2531fc 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/Customer.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
index 5f1342c40b..5f1342c40b 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
index f5708dec40..f5708dec40 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
index 17b342f8dd..17b342f8dd 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/retailer/Retailer.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
index afaf7aea02..afaf7aea02 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
index cd204ebc2e..cd204ebc2e 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/shipper/Shipper.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
index ca720085c5..ca720085c5 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
index b4807b80d1..b4807b80d1 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/java/supplychain/warehouse/Warehouse.java
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
index f71d822bbe..f71d822bbe 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
index 13a3c9b82a..13a3c9b82a 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
index b524abc2a6..b524abc2a6 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
index 5be79b741a..5be79b741a 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/supplychain.composite
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
index 8549ca3409..8549ca3409 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/Customer.wsdl
diff --git a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
index 88d1e72efc..88d1e72efc 100644
--- a/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/test-bundles/src/main/resources/supplychain/ws/supplychain.composite
diff --git a/branches/sca-android/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index ea1c78fa2a..ea1c78fa2a 100644
--- a/branches/sca-android/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
diff --git a/branches/sca-android/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
index 0c26477a43..0c26477a43 100644
--- a/branches/sca-android/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
diff --git a/branches/sca-android/itest/osgi-tuscany/tuscany-versioned/pom.xml b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/tuscany-versioned/pom.xml
index 88c5fae221..88c5fae221 100644
--- a/branches/sca-android/itest/osgi-tuscany/tuscany-versioned/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/osgi-tuscany/tuscany-versioned/pom.xml
diff --git a/branches/sca-android/itest/policy-security-basicauth/pom.xml b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/pom.xml
index ca9257b827..ca9257b827 100644
--- a/branches/sca-android/itest/policy-security-basicauth/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/pom.xml
diff --git a/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
index 55b798edbe..55b798edbe 100644
--- a/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
index 411dcae605..411dcae605 100644
--- a/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-android/itest/policy-security-basicauth/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/resources/definitions.xml
index 9099191b27..9099191b27 100644
--- a/branches/sca-android/itest/policy-security-basicauth/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/resources/definitions.xml
diff --git a/branches/sca-android/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/resources/helloworld.composite
index 247b2b56e4..247b2b56e4 100644
--- a/branches/sca-android/itest/policy-security-basicauth/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/resources/helloworld.composite
diff --git a/branches/sca-android/itest/policy-security-basicauth/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-android/itest/policy-security-basicauth/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/main/resources/jndi.properties
diff --git a/branches/sca-android/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
index b6e0444d2d..b6e0444d2d 100644
--- a/branches/sca-android/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
diff --git a/branches/sca-android/itest/policy-security-jsr250/pom.xml b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/pom.xml
index 2bb8001486..2bb8001486 100644
--- a/branches/sca-android/itest/policy-security-jsr250/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/pom.xml
diff --git a/branches/sca-android/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
index 3569410e7d..3569410e7d 100644
--- a/branches/sca-android/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
index 3e752144a0..3e752144a0 100644
--- a/branches/sca-android/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/policy-security-jsr250/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/main/resources/definitions.xml
index 64b8a95d18..64b8a95d18 100644
--- a/branches/sca-android/itest/policy-security-jsr250/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/main/resources/definitions.xml
diff --git a/branches/sca-android/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/main/resources/helloworld.composite
index 456ca450f1..456ca450f1 100644
--- a/branches/sca-android/itest/policy-security-jsr250/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/main/resources/helloworld.composite
diff --git a/branches/sca-android/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
index da5f6409ba..da5f6409ba 100644
--- a/branches/sca-android/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
diff --git a/branches/sca-android/itest/policy-security/pom.xml b/sca-java-1.x/branches/sca-android/itest/policy-security/pom.xml
index e8100e9fa0..e8100e9fa0 100644
--- a/branches/sca-android/itest/policy-security/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security/pom.xml
diff --git a/branches/sca-android/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-android/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-android/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/policy-security/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-android/itest/policy-security/src/main/resources/definitions.xml
index c8118a0caf..c8118a0caf 100644
--- a/branches/sca-android/itest/policy-security/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security/src/main/resources/definitions.xml
diff --git a/branches/sca-android/itest/policy-security/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/policy-security/src/main/resources/helloworld.composite
index 9e0f289f87..9e0f289f87 100644
--- a/branches/sca-android/itest/policy-security/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security/src/main/resources/helloworld.composite
diff --git a/branches/sca-android/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/sca-java-1.x/branches/sca-android/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
index 9dad17741e..9dad17741e 100644
--- a/branches/sca-android/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
diff --git a/branches/sca-android/itest/policy/pom.xml b/sca-java-1.x/branches/sca-android/itest/policy/pom.xml
index 68d03d72b6..68d03d72b6 100644
--- a/branches/sca-android/itest/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/policy/pom.xml
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/AddService.java
index 3e56bf3fad..3e56bf3fad 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/AddService.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorClient.java
index 9abc488523..9abc488523 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorService.java
index a1880698ea..a1880698ea 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
index 28ce0ec78a..28ce0ec78a 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/DivideService.java
index f72b05cece..f72b05cece 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/PolicyQNames.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/PolicyQNames.java
index 3e1bc45842..3e1bc45842 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/PolicyQNames.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/PolicyQNames.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
index 4b04a4d0b8..4b04a4d0b8 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
index 3dcadd724e..3dcadd724e 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
diff --git a/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
index 3d314a9d14..3d314a9d14 100644
--- a/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
diff --git a/branches/sca-android/itest/policy/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/policy/src/main/resources/Calculator.composite
index aed7684099..aed7684099 100644
--- a/branches/sca-android/itest/policy/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/resources/Calculator.composite
diff --git a/branches/sca-android/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a20489035b..a20489035b 100644
--- a/branches/sca-android/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-android/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index d9f144b3ff..d9f144b3ff 100644
--- a/branches/sca-android/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-android/itest/policy/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-android/itest/policy/src/main/resources/definitions.xml
index 0009d712f3..0009d712f3 100644
--- a/branches/sca-android/itest/policy/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/main/resources/definitions.xml
diff --git a/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/sca-java-1.x/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
index 885e8314ef..885e8314ef 100644
--- a/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
diff --git a/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/sca-java-1.x/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
index ba17755b88..ba17755b88 100644
--- a/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
diff --git a/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
index ff47988bce..ff47988bce 100644
--- a/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
diff --git a/branches/sca-android/itest/pom.xml b/sca-java-1.x/branches/sca-android/itest/pom.xml
index f18ce5f455..f18ce5f455 100644
--- a/branches/sca-android/itest/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/pom.xml
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/pom.xml b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/pom.xml
index 0b3c3cf0c7..0b3c3cf0c7 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/pom.xml
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
index 764f31b7cd..764f31b7cd 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/BusinessException.java
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
index 0c72b52ed9..0c72b52ed9 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClient.java
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
index d6545b5a23..d6545b5a23 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleClientImpl.java
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
index 30ea559694..30ea559694 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleService.java
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
index b3b6f033e5..b3b6f033e5 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/java/com/example/ExampleServiceImpl.java
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/example.composite b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/example.composite
index cddf951d65..cddf951d65 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/example.composite
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/example.composite
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
index a8ccde2e11..a8ccde2e11 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleService.wsdl
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
index 2caec0f20d..2caec0f20d 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/main/resources/wsdl/ExampleServiceTypes.xsd
diff --git a/branches/sca-android/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
index 740af4f43d..740af4f43d 100644
--- a/branches/sca-android/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/promotion-interface-missmatch/src/test/java/com/example/ExampleTestCase.java
diff --git a/branches/sca-android/itest/properties/pom.xml b/sca-java-1.x/branches/sca-android/itest/properties/pom.xml
index 62a50f1f54..62a50f1f54 100644
--- a/branches/sca-android/itest/properties/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/properties/pom.xml
diff --git a/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 51d064ba81..51d064ba81 100644
--- a/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index 38c26e70d6..38c26e70d6 100644
--- a/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index 6b714c0d67..6b714c0d67 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index 586d4864a9..586d4864a9 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index 5e3c985144..5e3c985144 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index 5b93bd8b8a..5b93bd8b8a 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index c0c068d12e..c0c068d12e 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 17b4e582d6..17b4e582d6 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index eb642b6637..eb642b6637 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index 0a84e93828..0a84e93828 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 6344a8aa83..6344a8aa83 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 11a0a758cd..11a0a758cd 100644
--- a/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 76bcd06fca..76bcd06fca 100644
--- a/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 7a809ebf1e..7a809ebf1e 100644
--- a/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/package-info.java
index f726552a62..f726552a62 100644
--- a/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/branches/sca-android/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index 70a251fa16..70a251fa16 100644
--- a/branches/sca-android/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/branches/sca-android/itest/properties/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/Outer.composite
index b3e529e8b5..b3e529e8b5 100644
--- a/branches/sca-android/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/Outer.composite
diff --git a/branches/sca-android/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/OuterPropertyTest.composite
index 5237e964a3..5237e964a3 100644
--- a/branches/sca-android/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/branches/sca-android/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/PropertyTest.composite
index 75deddbdad..75deddbdad 100644
--- a/branches/sca-android/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/branches/sca-android/itest/properties/src/main/resources/customer.xsd b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/customer.xsd
index 8861d7e7b8..8861d7e7b8 100644
--- a/branches/sca-android/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/customer.xsd
diff --git a/branches/sca-android/itest/properties/src/main/resources/fileProperty.txt b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/fileProperty.txt
index 0d3d9ead83..0d3d9ead83 100644
--- a/branches/sca-android/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/fileProperty.txt
diff --git a/branches/sca-android/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/manyValuesFileProperty.txt
index 450f397b30..450f397b30 100644
--- a/branches/sca-android/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/branches/sca-android/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/mySimpleService.composite
index 75fdd24add..75fdd24add 100644
--- a/branches/sca-android/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/branches/sca-android/itest/properties/src/main/resources/rcProps.txt b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/branches/sca-android/itest/properties/src/main/resources/rcProps.txt
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/rcProps.txt
diff --git a/branches/sca-android/itest/properties/src/main/resources/rcprops.xsd b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/branches/sca-android/itest/properties/src/main/resources/rcprops.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/main/resources/rcprops.xsd
diff --git a/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index 8cf182e24a..8cf182e24a 100644
--- a/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-1.x/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index 28357c5bbe..28357c5bbe 100644
--- a/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-1.x/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index 6979659ece..6979659ece 100644
--- a/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-1.x/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index 8ee5dce91f..8ee5dce91f 100644
--- a/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/branches/sca-android/itest/recursive-multi-level/pom.xml b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/pom.xml
index 48d45e50f6..48d45e50f6 100644
--- a/branches/sca-android/itest/recursive-multi-level/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/pom.xml
diff --git a/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 214d4d8a1f..214d4d8a1f 100644
--- a/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 51948a3b81..51948a3b81 100644
--- a/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index 08df8ade17..08df8ade17 100644
--- a/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index 2ad9f815f0..2ad9f815f0 100644
--- a/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 975f61c664..975f61c664 100644
--- a/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index f9bbcc76d8..f9bbcc76d8 100644
--- a/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 09fd10fb7e..09fd10fb7e 100644
--- a/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/branches/sca-android/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index d8d6fe0dc5..d8d6fe0dc5 100644
--- a/branches/sca-android/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/branches/sca-android/itest/recursive-ws/pom.xml b/sca-java-1.x/branches/sca-android/itest/recursive-ws/pom.xml
index 5ed11a4c7a..5ed11a4c7a 100644
--- a/branches/sca-android/itest/recursive-ws/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/pom.xml
diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/policy/Target.java
index c77fcea868..c77fcea868 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/java/policy/Target.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/policy/Target.java
diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
index 87e412829e..87e412829e 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
index e565055252..e565055252 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/Composer.java
index e53f99d9c3..e53f99d9c3 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/Composer.java
diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
index 7956d153cb..7956d153cb 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
index 3d75b7b165..3d75b7b165 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
index 8b77484922..8b77484922 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
index 5035d1cbd9..5035d1cbd9 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/Client.composite
index 56d7c01377..56d7c01377 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/resources/Client.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/Client.composite
diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/Inner.composite
index b054ae0944..b054ae0944 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/resources/Inner.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/Inner.composite
diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/Outer.composite
index 3c3f327b28..3c3f327b28 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/resources/Outer.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/Outer.composite
diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
index b5c180919c..b5c180919c 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
index 891cac0b79..891cac0b79 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
index 4b398743eb..4b398743eb 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
index b50bc29a1f..b50bc29a1f 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/policy/definitions.xml
index 3ae202f4aa..3ae202f4aa 100644
--- a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/main/resources/policy/definitions.xml
diff --git a/branches/sca-android/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
index c6e46564f0..c6e46564f0 100644
--- a/branches/sca-android/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
diff --git a/branches/sca-android/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
index 3e71246da2..3e71246da2 100644
--- a/branches/sca-android/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
diff --git a/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
index 6638d65551..6638d65551 100644
--- a/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
diff --git a/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
index 214379bcea..214379bcea 100644
--- a/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
diff --git a/branches/sca-android/itest/recursive/pom.xml b/sca-java-1.x/branches/sca-android/itest/recursive/pom.xml
index 20aa39e90d..20aa39e90d 100644
--- a/branches/sca-android/itest/recursive/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/pom.xml
diff --git a/branches/sca-android/itest/recursive/src/main/java/circular/include/DemoClass.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/circular/include/DemoClass.java
index fe42911486..fe42911486 100644
--- a/branches/sca-android/itest/recursive/src/main/java/circular/include/DemoClass.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/circular/include/DemoClass.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/CompositeClient.java
index 5edc305970..5edc305970 100644
--- a/branches/sca-android/itest/recursive/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-android/itest/recursive/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/Source.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-android/itest/recursive/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-android/itest/recursive/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-android/itest/recursive/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/Target.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-android/itest/recursive/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/foo/A.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/foo/A.java
index e87cbde26d..e87cbde26d 100644
--- a/branches/sca-android/itest/recursive/src/main/java/foo/A.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/foo/A.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/foo/B.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/foo/B.java
index 9d060cab59..9d060cab59 100644
--- a/branches/sca-android/itest/recursive/src/main/java/foo/B.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/foo/B.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/foo/I.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/foo/I.java
index f6d55baef3..f6d55baef3 100644
--- a/branches/sca-android/itest/recursive/src/main/java/foo/I.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/foo/I.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/policy/Target.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/policy/Target.java
index c77fcea868..c77fcea868 100644
--- a/branches/sca-android/itest/recursive/src/main/java/policy/Target.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/policy/Target.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/policy/TargetClientImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/policy/TargetClientImpl.java
index 87e412829e..87e412829e 100644
--- a/branches/sca-android/itest/recursive/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/policy/TargetClientImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/policy/TargetServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/policy/TargetServiceImpl.java
index e565055252..e565055252 100644
--- a/branches/sca-android/itest/recursive/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/policy/TargetServiceImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/sample/ComponentAImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/ComponentAImpl.java
index f513949105..f513949105 100644
--- a/branches/sca-android/itest/recursive/src/main/java/sample/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/ComponentAImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/sample/ComponentCImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/ComponentCImpl.java
index 586a9ee6a7..586a9ee6a7 100644
--- a/branches/sca-android/itest/recursive/src/main/java/sample/ComponentCImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/ComponentCImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/sample/ComponentEImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/ComponentEImpl.java
index dbf2735aa7..dbf2735aa7 100644
--- a/branches/sca-android/itest/recursive/src/main/java/sample/ComponentEImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/ComponentEImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/sample/ComponentFImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/ComponentFImpl.java
index 5e136e536c..5e136e536c 100644
--- a/branches/sca-android/itest/recursive/src/main/java/sample/ComponentFImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/ComponentFImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/sample/Service1.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/Service1.java
index 81bdce79f1..81bdce79f1 100644
--- a/branches/sca-android/itest/recursive/src/main/java/sample/Service1.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/sample/Service1.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/test/Aggregator.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/Aggregator.java
index 88b3bed1b2..88b3bed1b2 100644
--- a/branches/sca-android/itest/recursive/src/main/java/test/Aggregator.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/Aggregator.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/test/AggregatorImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/AggregatorImpl.java
index f6ac6c8741..f6ac6c8741 100644
--- a/branches/sca-android/itest/recursive/src/main/java/test/AggregatorImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/AggregatorImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/test/InnerSourceImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/InnerSourceImpl.java
index c8dad5ae35..c8dad5ae35 100644
--- a/branches/sca-android/itest/recursive/src/main/java/test/InnerSourceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/InnerSourceImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/test/OuterSourceImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/OuterSourceImpl.java
index 11816e82cf..11816e82cf 100644
--- a/branches/sca-android/itest/recursive/src/main/java/test/OuterSourceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/OuterSourceImpl.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/test/Source.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/Source.java
index 9b93740d9d..9b93740d9d 100644
--- a/branches/sca-android/itest/recursive/src/main/java/test/Source.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test/Source.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/test1/composite/Target.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test1/composite/Target.java
index 4883e12f49..4883e12f49 100644
--- a/branches/sca-android/itest/recursive/src/main/java/test1/composite/Target.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test1/composite/Target.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/test1/composite/TargetOne.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test1/composite/TargetOne.java
index a7c68f4ffd..a7c68f4ffd 100644
--- a/branches/sca-android/itest/recursive/src/main/java/test1/composite/TargetOne.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test1/composite/TargetOne.java
diff --git a/branches/sca-android/itest/recursive/src/main/java/test1/composite/TargetTwo.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test1/composite/TargetTwo.java
index 7fff8e2e9b..7fff8e2e9b 100644
--- a/branches/sca-android/itest/recursive/src/main/java/test1/composite/TargetTwo.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/java/test1/composite/TargetTwo.java
diff --git a/branches/sca-android/itest/recursive/src/main/resources/AComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/AComposite.composite
index 1b5dee8762..1b5dee8762 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/AComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/AComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/BComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/BComposite.composite
index 7d4588eba4..7d4588eba4 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/BComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/BComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/CComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/CComposite.composite
index 6d7b4ec600..6d7b4ec600 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/CComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/CComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/Composite1.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Composite1.composite
index 56fd7c621f..56fd7c621f 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/Composite1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Composite1.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/Composite2.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Composite2.composite
index 54f10673a4..54f10673a4 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/Composite2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Composite2.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/Composite3.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Composite3.composite
index 040653493f..040653493f 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/Composite3.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Composite3.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/Demo1Composite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Demo1Composite.composite
index 6b2a964b9b..6b2a964b9b 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/Demo1Composite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Demo1Composite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/Demo2Composite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Demo2Composite.composite
index 6b8c0a348e..6b8c0a348e 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/Demo2Composite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Demo2Composite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/Inner.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Inner.composite
index 398ebdf6e2..398ebdf6e2 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/Inner.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Inner.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
index 289b92a3f2..289b92a3f2 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/recursive/src/main/resources/Outer.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Outer.composite
index 987990d854..987990d854 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/Outer.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/Outer.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/foo/foo.png b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/foo.png
index 0f2ec78aaf..0f2ec78aaf 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/foo/foo.png
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/foo.png
diff --git a/branches/sca-android/itest/recursive/src/main/resources/foo/o1.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/o1.composite
index 1d31c2f424..1d31c2f424 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/foo/o1.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/o1.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/foo/o2.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/o2.composite
index 4f21c21860..4f21c21860 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/foo/o2.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/o2.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/foo/o3.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/o3.composite
index 72c732c03e..72c732c03e 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/foo/o3.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/o3.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/foo/o4.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/o4.composite
index f8f07eed09..f8f07eed09 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/foo/o4.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/foo/o4.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
index 4a6df023b8..4a6df023b8 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
index 25007aebb2..25007aebb2 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/policy/definitions.xml b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/policy/definitions.xml
index 957028e3bd..957028e3bd 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/policy/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/policy/definitions.xml
diff --git a/branches/sca-android/itest/recursive/src/main/resources/test1/InnerComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/test1/InnerComposite.composite
index 177fa10550..177fa10550 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/test1/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/test1/InnerComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/main/resources/test1/OuterComposite.composite b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/test1/OuterComposite.composite
index d05a67f45f..d05a67f45f 100644
--- a/branches/sca-android/itest/recursive/src/main/resources/test1/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/main/resources/test1/OuterComposite.composite
diff --git a/branches/sca-android/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
index 1f7c35dd91..1f7c35dd91 100644
--- a/branches/sca-android/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/circular/include/CircularIncludeTestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/composite/CompositeTestCase.java
index 5482e47463..5482e47463 100644
--- a/branches/sca-android/itest/recursive/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
index f042113f7a..f042113f7a 100644
--- a/branches/sca-android/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/composite/LocateServiceEmbeddedSCADomainTestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
index 87eb948452..87eb948452 100644
--- a/branches/sca-android/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/composite/LocateServiceSCADomainTestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/foo/O2TestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/foo/O2TestCase.java
index d617ec8592..d617ec8592 100644
--- a/branches/sca-android/itest/recursive/src/test/java/foo/O2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/foo/O2TestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/foo/O4TestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/foo/O4TestCase.java
index 15626c75ac..15626c75ac 100644
--- a/branches/sca-android/itest/recursive/src/test/java/foo/O4TestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/foo/O4TestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/policy/PolicyTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/policy/PolicyTestCase.java
index c9cc84f7d4..c9cc84f7d4 100644
--- a/branches/sca-android/itest/recursive/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/policy/PolicyTestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/sample/C.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/C.java
index bf8391348b..bf8391348b 100644
--- a/branches/sca-android/itest/recursive/src/test/java/sample/C.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/C.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/sample/CImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/CImpl.java
index 466284983e..466284983e 100644
--- a/branches/sca-android/itest/recursive/src/test/java/sample/CImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/CImpl.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/sample/NestedTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/NestedTestCase.java
index fc5d251460..fc5d251460 100644
--- a/branches/sca-android/itest/recursive/src/test/java/sample/NestedTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/NestedTestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
index a543add69b..a543add69b 100644
--- a/branches/sca-android/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/RecursiveCompositeTestCaseFIXME.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/sample/X.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/X.java
index e3a9335068..e3a9335068 100644
--- a/branches/sca-android/itest/recursive/src/test/java/sample/X.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/X.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/sample/XImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/XImpl.java
index e430807568..e430807568 100644
--- a/branches/sca-android/itest/recursive/src/test/java/sample/XImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/XImpl.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/sample/Y.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/Y.java
index c15a4f635a..c15a4f635a 100644
--- a/branches/sca-android/itest/recursive/src/test/java/sample/Y.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/Y.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/sample/YImpl.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/YImpl.java
index 994c9eb95f..994c9eb95f 100644
--- a/branches/sca-android/itest/recursive/src/test/java/sample/YImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/sample/YImpl.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/test/InnerTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/test/InnerTestCase.java
index ebb4bc7acb..ebb4bc7acb 100644
--- a/branches/sca-android/itest/recursive/src/test/java/test/InnerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/test/InnerTestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/test/OuterTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/test/OuterTestCase.java
index 6e95f5808b..6e95f5808b 100644
--- a/branches/sca-android/itest/recursive/src/test/java/test/OuterTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/test/OuterTestCase.java
diff --git a/branches/sca-android/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
index b3abcac06e..b3abcac06e 100644
--- a/branches/sca-android/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/recursive/src/test/java/test1/composite/CompositeClientTestCase.java
diff --git a/branches/sca-android/itest/references/pom.xml b/sca-java-1.x/branches/sca-android/itest/references/pom.xml
index 5558936b92..5558936b92 100644
--- a/branches/sca-android/itest/references/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/references/pom.xml
diff --git a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index 647fff0159..647fff0159 100644
--- a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 6b1065ab0d..6b1065ab0d 100644
--- a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 2618ec7095..2618ec7095 100644
--- a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index 79c802bc97..79c802bc97 100644
--- a/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/branches/sca-android/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-1.x/branches/sca-android/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 9f88f05abe..9f88f05abe 100644
--- a/branches/sca-android/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/branches/sca-android/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-1.x/branches/sca-android/itest/references/src/main/resources/InnerReferencesTest.composite
index 6cadc52c13..6cadc52c13 100644
--- a/branches/sca-android/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/branches/sca-android/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-1.x/branches/sca-android/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index 3b546a34e0..3b546a34e0 100644
--- a/branches/sca-android/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-1.x/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index b803f4bfa4..b803f4bfa4 100644
--- a/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-1.x/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 1d8284f0fd..1d8284f0fd 100644
--- a/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-1.x/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
index 4b3a745a19..4b3a745a19 100644
--- a/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/branches/sca-android/itest/scopes/pom.xml b/sca-java-1.x/branches/sca-android/itest/scopes/pom.xml
index cf7010ca91..cf7010ca91 100644
--- a/branches/sca-android/itest/scopes/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/scopes/pom.xml
diff --git a/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-1.x/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index 4aa414be8e..4aa414be8e 100644
--- a/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java b/sca-java-1.x/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
index fae4dcd586..fae4dcd586 100644
--- a/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
diff --git a/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-1.x/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index 878f7e4cc6..878f7e4cc6 100644
--- a/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-1.x/branches/sca-android/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/branches/sca-android/itest/scopes/src/main/resources/scopes.composite b/sca-java-1.x/branches/sca-android/itest/scopes/src/main/resources/scopes.composite
index 54a1b66830..54a1b66830 100644
--- a/branches/sca-android/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-1.x/branches/sca-android/itest/scopes/src/main/resources/scopes.composite
diff --git a/branches/sca-android/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-1.x/branches/sca-android/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index ce2519cbc0..ce2519cbc0 100644
--- a/branches/sca-android/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/branches/sca-android/itest/serialization/pom.xml b/sca-java-1.x/branches/sca-android/itest/serialization/pom.xml
index 9a6c3ea1e3..9a6c3ea1e3 100644
--- a/branches/sca-android/itest/serialization/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/pom.xml
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
index fa0f1c88d6..fa0f1c88d6 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalService.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
index 85d5dd860c..85d5dd860c 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceCallback.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
index 50c98d1afc..50c98d1afc 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/ConversationalServiceImpl.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
index c268f9bda7..c268f9bda7 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClient.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
index cf0307eb8e..cf0307eb8e 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedClientImpl.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
index deb8f75816..deb8f75816 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClient.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
index 60ecb7717a..60ecb7717a 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/SCAManagedConversationalClientImpl.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
index 8a1fe48436..8a1fe48436 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessService.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
index ffe3a3b8ef..ffe3a3b8ef 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceCallback.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
index 24d43f79e3..24d43f79e3 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/StatelessServiceImpl.java
diff --git a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
index 2749891bd4..2749891bd4 100644
--- a/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/java/org/apache/tuscany/sca/itest/servicereference/utils/ServiceReferenceUtils.java
diff --git a/branches/sca-android/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
index 28c32d6fa4..28c32d6fa4 100644
--- a/branches/sca-android/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/resources/ServiceReferenceSerializationTest.composite
diff --git a/branches/sca-android/itest/serialization/src/main/resources/nestedcomposite.composite b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/resources/nestedcomposite.composite
index 8e1a132b0a..8e1a132b0a 100644
--- a/branches/sca-android/itest/serialization/src/main/resources/nestedcomposite.composite
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/main/resources/nestedcomposite.composite
diff --git a/branches/sca-android/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-android/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
index 76e77284fb..76e77284fb 100644
--- a/branches/sca-android/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/serialization/src/test/java/org/apache/tuscany/sca/itest/servicereference/SerializeServiceReferenceTestCase.java
diff --git a/branches/sca-android/itest/services/pom.xml b/sca-java-1.x/branches/sca-android/itest/services/pom.xml
index fdd5213a47..fdd5213a47 100644
--- a/branches/sca-android/itest/services/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/services/pom.xml
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 1304ba4288..1304ba4288 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 3577e09add..3577e09add 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index 2e9b56d64d..2e9b56d64d 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index cda3f38636..cda3f38636 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 39806a8101..39806a8101 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index aa745deb63..aa745deb63 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 83da15089f..83da15089f 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index 36189f94bb..36189f94bb 100644
--- a/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/branches/sca-android/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/services/src/main/resources/META-INF/sca-contribution.xml
index 37ea8f677d..37ea8f677d 100644
--- a/branches/sca-android/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/services/src/main/resources/ServicesTest.composite b/sca-java-1.x/branches/sca-android/itest/services/src/main/resources/ServicesTest.composite
index eda885f9ec..eda885f9ec 100644
--- a/branches/sca-android/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/main/resources/ServicesTest.composite
diff --git a/branches/sca-android/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-1.x/branches/sca-android/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index ba6cac279c..ba6cac279c 100644
--- a/branches/sca-android/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/branches/sca-android/itest/spring/pom.xml b/sca-java-1.x/branches/sca-android/itest/spring/pom.xml
index 331b9c4c17..331b9c4c17 100644
--- a/branches/sca-android/itest/spring/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/spring/pom.xml
diff --git a/branches/sca-android/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml b/sca-java-1.x/branches/sca-android/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
index 18ab7e332d..18ab7e332d 100644
--- a/branches/sca-android/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/main/resources/META-INF/sca/SpringDelegationHelloWorld-context.xml
diff --git a/branches/sca-android/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-android/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/branches/sca-android/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-android/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-1.x/branches/sca-android/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index 70b2d5fdab..70b2d5fdab 100644
--- a/branches/sca-android/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/branches/sca-android/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-android/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index bab9ecb528..bab9ecb528 100644
--- a/branches/sca-android/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 634e3d34af..634e3d34af 100644
--- a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index aeb7918add..aeb7918add 100644
--- a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 3957e49bf3..3957e49bf3 100644
--- a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index d75d19295d..d75d19295d 100644
--- a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index 4088691ccd..4088691ccd 100644
--- a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index 840bf59b73..840bf59b73 100644
--- a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index fa7967c964..fa7967c964 100644
--- a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index b57cc7f366..b57cc7f366 100644
--- a/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-1.x/branches/sca-android/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/branches/sca-android/itest/transaction/pom.xml b/sca-java-1.x/branches/sca-android/itest/transaction/pom.xml
index 3b8f3700f1..3b8f3700f1 100644
--- a/branches/sca-android/itest/transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/pom.xml
diff --git a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
index d7d18181d9..d7d18181d9 100644
--- a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountNotFoundException.java
diff --git a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
index ac986dd417..ac986dd417 100644
--- a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountService.java
diff --git a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
index a6ea036da7..a6ea036da7 100644
--- a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/AccountServiceImpl.java
diff --git a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
index 3e1cb29f33..3e1cb29f33 100644
--- a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/CheckingAccountServiceImpl.java
diff --git a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
index 4d504a6a36..4d504a6a36 100644
--- a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/OverDraftException.java
diff --git a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
index 156b34227d..156b34227d 100644
--- a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/SavingsAccountServiceImpl.java
diff --git a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
index b7ea5f2663..b7ea5f2663 100644
--- a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferService.java
diff --git a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
index 341a7e53e3..341a7e53e3 100644
--- a/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/java/org/apache/tuscany/sca/itest/transaction/TransferServiceImpl.java
diff --git a/branches/sca-android/itest/transaction/src/main/resources/accounts.composite b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/resources/accounts.composite
index f4c6b650c7..f4c6b650c7 100644
--- a/branches/sca-android/itest/transaction/src/main/resources/accounts.composite
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/resources/accounts.composite
diff --git a/branches/sca-android/itest/transaction/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/resources/definitions.xml
index 8aa6ba313a..8aa6ba313a 100644
--- a/branches/sca-android/itest/transaction/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/resources/definitions.xml
diff --git a/branches/sca-android/itest/transaction/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-android/itest/transaction/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-android/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
index c23628ff91..c23628ff91 100644
--- a/branches/sca-android/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/ConcurrentXAResourceTestCase.java
diff --git a/branches/sca-android/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java b/sca-java-1.x/branches/sca-android/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
index 36884f6098..36884f6098 100644
--- a/branches/sca-android/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/transaction/src/test/java/org/apache/tuscany/sca/itest/transaction/TransactionTestCase.java
diff --git a/branches/sca-android/itest/validation/pom.xml b/sca-java-1.x/branches/sca-android/itest/validation/pom.xml
index 3d1d0c04f5..3d1d0c04f5 100644
--- a/branches/sca-android/itest/validation/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/pom.xml
diff --git a/branches/sca-android/itest/validation/src/main/java/binding/ejb/account/Customer.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/ejb/account/Customer.java
index acb74c38ae..acb74c38ae 100644
--- a/branches/sca-android/itest/validation/src/main/java/binding/ejb/account/Customer.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/ejb/account/Customer.java
diff --git a/branches/sca-android/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
index 52ddfa9aba..52ddfa9aba 100644
--- a/branches/sca-android/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
index aec8998083..aec8998083 100644
--- a/branches/sca-android/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
index 5df24b6379..5df24b6379 100644
--- a/branches/sca-android/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
diff --git a/branches/sca-android/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/jms/HelloWorldService.java
index 33bfe1d0ea..33bfe1d0ea 100644
--- a/branches/sca-android/itest/validation/src/main/java/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/jms/HelloWorldService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
index a6a40b0ed1..a6a40b0ed1 100644
--- a/branches/sca-android/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddService.java
index 35ba2cbfac..35ba2cbfac 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
index ef305370cc..ef305370cc 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
index aacde27842..aacde27842 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
index 185f17a5ca..185f17a5ca 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorService.java
index f472d6aaf6..f472d6aaf6 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
index 77aafe83de..77aafe83de 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/DivideService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/DivideService.java
index a93d23e61c..a93d23e61c 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/DivideService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
index 080594034b..080594034b 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/MultiplyService.java
index 20d48e93d5..20d48e93d5 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/MultiplyService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
index 96f0b55fa2..96f0b55fa2 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/PropertyService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/PropertyService.java
index 4f1ccc96f8..4f1ccc96f8 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/PropertyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/PropertyService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
index 429daf5f2d..429daf5f2d 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractService.java
index 40e382dc74..40e382dc74 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
index 8cdbe0813d..8cdbe0813d 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
index d5e9fcf020..d5e9fcf020 100644
--- a/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/AddService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/AddService.java
index 0db8ce4f5c..0db8ce4f5c 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/AddService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/AddService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/AddServiceImpl.java
index 83f2685d54..83f2685d54 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/AddServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorClient.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorClient.java
index e34ce3db26..e34ce3db26 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorClient.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorService.java
index 5d583fd604..5d583fd604 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
index 0183e2a259..0183e2a259 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/DivideService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/DivideService.java
index 85ebadc9a0..85ebadc9a0 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/DivideService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
index 863c298234..863c298234 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/MultiplyService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/MultiplyService.java
index e1bf7fbddc..e1bf7fbddc 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/MultiplyService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
index 6346ea3582..6346ea3582 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/SubtractService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/SubtractService.java
index 57759bb496..57759bb496 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/SubtractService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
index 16e3e6a23d..16e3e6a23d 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
index 6f9df2c034..6f9df2c034 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
index bafff878cd..bafff878cd 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
index e44d93e6be..e44d93e6be 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/spring/HelloWorld.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/spring/HelloWorld.java
index ef0b491617..ef0b491617 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/spring/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/spring/HelloWorld.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
index 2e3458f0d3..2e3458f0d3 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
diff --git a/branches/sca-android/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
index 87904f2a72..87904f2a72 100644
--- a/branches/sca-android/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
diff --git a/branches/sca-android/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
index fa1a621f12..fa1a621f12 100644
--- a/branches/sca-android/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
diff --git a/branches/sca-android/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
index ebf7a79589..ebf7a79589 100644
--- a/branches/sca-android/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
diff --git a/branches/sca-android/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
index b2e7da05a2..b2e7da05a2 100644
--- a/branches/sca-android/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
index 4ba9f0724b..4ba9f0724b 100644
--- a/branches/sca-android/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
index b935dd194a..b935dd194a 100644
--- a/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
index 2b633f3139..2b633f3139 100644
--- a/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
index 940e27a1e7..940e27a1e7 100644
--- a/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
index 50d78cb2a6..50d78cb2a6 100644
--- a/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
index bd788e47b8..bd788e47b8 100644
--- a/branches/sca-android/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
index 7281878c0f..7281878c0f 100644
--- a/branches/sca-android/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 609ffed02d..609ffed02d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
index 08e18decc1..08e18decc1 100644
--- a/branches/sca-android/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
index 36e71e398b..36e71e398b 100644
--- a/branches/sca-android/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
index 9a46e09363..9a46e09363 100644
--- a/branches/sca-android/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
index 59017f0c09..59017f0c09 100644
--- a/branches/sca-android/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
index 462a95dd02..462a95dd02 100644
--- a/branches/sca-android/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
index 4b6c44bd58..4b6c44bd58 100644
--- a/branches/sca-android/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
index a397e3384c..a397e3384c 100644
--- a/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
index 08fab865fa..08fab865fa 100644
--- a/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
index 3a5f59b17c..3a5f59b17c 100644
--- a/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
index 8221e41430..8221e41430 100644
--- a/branches/sca-android/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
index 9c5ae7027f..9c5ae7027f 100644
--- a/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
index 3c85ed32e2..3c85ed32e2 100644
--- a/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
index 2d1a1e01f0..2d1a1e01f0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
index efb457ac9e..efb457ac9e 100644
--- a/branches/sca-android/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
index a5beaf4ec9..a5beaf4ec9 100644
--- a/branches/sca-android/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
index 06c3eeeaca..06c3eeeaca 100644
--- a/branches/sca-android/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
index 821ce570c8..821ce570c8 100644
--- a/branches/sca-android/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/XsdValidation/Calculator.composite
index 63ccaa9957..63ccaa9957 100644
--- a/branches/sca-android/itest/validation/src/main/resources/XsdValidation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/XsdValidation/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
index da565081f3..da565081f3 100644
--- a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
index 6153d40c3d..6153d40c3d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
index a3eb60bf58..a3eb60bf58 100644
--- a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
index 6233d47d8d..6233d47d8d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
index 6a9af9e070..6a9af9e070 100644
--- a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
index 49b26c78f8..49b26c78f8 100644
--- a/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
index c34a160b61..c34a160b61 100644
--- a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
index 293c4d725d..293c4d725d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
index b7ff1e304f..b7ff1e304f 100644
--- a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
index 218dbc47c4..218dbc47c4 100644
--- a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
index 5975c27663..5975c27663 100644
--- a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
index 8cda0b007e..8cda0b007e 100644
--- a/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
index 781319d619..781319d619 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
index 8a0dfac98b..8a0dfac98b 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
index fcfe408582..fcfe408582 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
index ede3b3fd40..ede3b3fd40 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
index a8c89a0bf5..a8c89a0bf5 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
index b4e56d1789..b4e56d1789 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
index e68eb75d64..e68eb75d64 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
index 00c7a3f86b..00c7a3f86b 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
index d656d47cfd..d656d47cfd 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
index ad1daacfcf..ad1daacfcf 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
index 145aea9fbc..145aea9fbc 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
index c52da84a0c..c52da84a0c 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
index fb35f5d1b8..fb35f5d1b8 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
index fcdf25455c..fcdf25455c 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
index 14f1314a1b..14f1314a1b 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
index 1a3cb21ac6..1a3cb21ac6 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
index 80b8f9d938..80b8f9d938 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
index 8fd1e2f554..8fd1e2f554 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
index b74682e1bd..b74682e1bd 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
index f439ab6260..f439ab6260 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
index e22f30152e..e22f30152e 100644
--- a/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
index 6ef7558d95..6ef7558d95 100644
--- a/branches/sca-android/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
index 77a2715373..77a2715373 100644
--- a/branches/sca-android/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
index 6e5fcf1286..6e5fcf1286 100644
--- a/branches/sca-android/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
index 8a2a1a23be..8a2a1a23be 100644
--- a/branches/sca-android/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
index 7f5eb546e0..7f5eb546e0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
index 0dfe52985a..0dfe52985a 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
index d3f249720d..d3f249720d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
index 575927a5de..575927a5de 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
index 973d1f618a..973d1f618a 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
index 5d2aeddc3d..5d2aeddc3d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
index 077df56290..077df56290 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
index 68df3156a8..68df3156a8 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
index 695fd60887..695fd60887 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
index 94ee650207..94ee650207 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
index f3cf93ddaa..f3cf93ddaa 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
index f9016219a5..f9016219a5 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
index 881c24854b..881c24854b 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
index 4e680f1200..4e680f1200 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
index e01643ed8f..e01643ed8f 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
index d776882ed0..d776882ed0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
index 0d1ffc97e4..0d1ffc97e4 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
index 99c529d77f..99c529d77f 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
index c75f209b6d..c75f209b6d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
index a5874707da..a5874707da 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
index 393b9fe674..393b9fe674 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
index 1dca444938..1dca444938 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
index 9a60183c5c..9a60183c5c 100644
--- a/branches/sca-android/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
index bc7bf3f250..bc7bf3f250 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
index a1a699fc75..a1a699fc75 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
index 7446e4f06a..7446e4f06a 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
index 0bbb10706e..0bbb10706e 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
index 9d9376ad6c..9d9376ad6c 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
index 3885357625..3885357625 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
index d9252ba54f..d9252ba54f 100644
--- a/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
index ac45d95ce8..ac45d95ce8 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
index 5cf6963a96..5cf6963a96 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
index d31c705fb5..d31c705fb5 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
index d214a7f40a..d214a7f40a 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
index ede1786942..ede1786942 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
index fcb43c949b..fcb43c949b 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
index 8346dcc01a..8346dcc01a 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
diff --git a/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
index 60f4de5cd3..60f4de5cd3 100644
--- a/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
index 9b0d51eb59..9b0d51eb59 100644
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
index e8476991a9..e8476991a9 100644
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
index 8ae156d63e..8ae156d63e 100644
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
index d757ff98dd..d757ff98dd 100644
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
index 9a231a18c7..9a231a18c7 100644
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
diff --git a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
index 4ae88b9ba3..4ae88b9ba3 100644
--- a/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
index ff94ad7b93..ff94ad7b93 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
index a192674aeb..a192674aeb 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
index e0e5347d96..e0e5347d96 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
index 9e08afec09..9e08afec09 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
index ed96072780..ed96072780 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
index a2a5b0b872..a2a5b0b872 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
index 64b41623de..64b41623de 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
index 86fbe51dad..86fbe51dad 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
index 6e884c41cd..6e884c41cd 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
index c237f8af18..c237f8af18 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
index 52dc7e5795..52dc7e5795 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
index a93df290c3..a93df290c3 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
index 949ec02134..949ec02134 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
index a974ef0db4..a974ef0db4 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
index adbaa50dc0..adbaa50dc0 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
index 4bba6b74de..4bba6b74de 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
index 8f4fc1a739..8f4fc1a739 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
index d9e1c782a8..d9e1c782a8 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
index 3e4e36d839..3e4e36d839 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
index 60ea47a85f..60ea47a85f 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
index 6a75a35f99..6a75a35f99 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
index c0f60a848f..c0f60a848f 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
index 5a74194796..5a74194796 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
index 7991de7176..7991de7176 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
index 1ef5f7b00a..1ef5f7b00a 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
index a0a7d12b9f..a0a7d12b9f 100644
--- a/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
index 555810f453..555810f453 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
index 4d70df1102..4d70df1102 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
index 7593f39991..7593f39991 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
index 0a711175dc..0a711175dc 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
index 10660795a7..10660795a7 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 15b4b15989..15b4b15989 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
index 55741ec2ef..55741ec2ef 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
index 7f8bd68e5e..7f8bd68e5e 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
index 1f26d3a7d6..1f26d3a7d6 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
index d398efc9ea..d398efc9ea 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
index 9d2f028dea..9d2f028dea 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
index 7f836e4b01..7f836e4b01 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
index 04c2594cd3..04c2594cd3 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
index 3dabfecbb6..3dabfecbb6 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
index 0dca8ed1df..0dca8ed1df 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
index 37f7ef352e..37f7ef352e 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
index ab57283a9e..ab57283a9e 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
index 4c3cc3856a..4c3cc3856a 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
index 06fb06f6ad..06fb06f6ad 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
index 6bacc8b05e..6bacc8b05e 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
index d615857105..d615857105 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
index e9b920119a..e9b920119a 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
index 4d950e30ff..4d950e30ff 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
index 60b08764c1..60b08764c1 100644
--- a/branches/sca-android/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
index 04135ab2cc..04135ab2cc 100644
--- a/branches/sca-android/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
index ab0afc6f65..ab0afc6f65 100644
--- a/branches/sca-android/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
index 69c4d40bc7..69c4d40bc7 100644
--- a/branches/sca-android/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
index 32c1a8b3a8..32c1a8b3a8 100644
--- a/branches/sca-android/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
index 8665bfd535..8665bfd535 100644
--- a/branches/sca-android/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
index 9d97e3611a..9d97e3611a 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
index 80c15dc444..80c15dc444 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
index 81e8aecfeb..81e8aecfeb 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
index fb0c525aea..fb0c525aea 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
index 445629457e..445629457e 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
index 00b904ae65..00b904ae65 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
index b7a4ee6fef..b7a4ee6fef 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
index 32d3211f36..32d3211f36 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
index b31451c433..b31451c433 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
index 3a7745722a..3a7745722a 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
index 59fc3ce79c..59fc3ce79c 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
index 6f54ad140c..6f54ad140c 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
index 3d75fa8ccc..3d75fa8ccc 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
index 398c028dd8..398c028dd8 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
index 117a94337a..117a94337a 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
index 14ba8e992e..14ba8e992e 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
index 461895f824..461895f824 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
index 9b7dbef3dd..9b7dbef3dd 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
index cd38b53f66..cd38b53f66 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
index 83550ae58d..83550ae58d 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
index d098bb4bf8..d098bb4bf8 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
index 2f85d8ed4a..2f85d8ed4a 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
index f90fc3b83f..f90fc3b83f 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
index 01450a8836..01450a8836 100644
--- a/branches/sca-android/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
index a03e056298..a03e056298 100644
--- a/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
index e0524f57b7..e0524f57b7 100644
--- a/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
index e212477c61..e212477c61 100644
--- a/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
index df2a2671df..df2a2671df 100644
--- a/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
index 361e2f2bfb..361e2f2bfb 100644
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
index a85dc334f4..a85dc334f4 100644
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
index 3f98757ce5..3f98757ce5 100644
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
index 3b8d075165..3b8d075165 100644
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
index bcf1f82392..bcf1f82392 100644
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
index 5683d54e64..5683d54e64 100644
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
diff --git a/branches/sca-android/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
index eec39d711e..eec39d711e 100644
--- a/branches/sca-android/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
diff --git a/branches/sca-android/itest/wires/pom.xml b/sca-java-1.x/branches/sca-android/itest/wires/pom.xml
index 08a97d8414..08a97d8414 100644
--- a/branches/sca-android/itest/wires/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/wires/pom.xml
diff --git a/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-1.x/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index 09d5b0278e..09d5b0278e 100644
--- a/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-1.x/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index f0964ebb93..f0964ebb93 100644
--- a/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-1.x/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index c19a0b4f74..c19a0b4f74 100644
--- a/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index b7ccdbf8d1..b7ccdbf8d1 100644
--- a/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/branches/sca-android/itest/wires/src/main/resources/WireTest.composite b/sca-java-1.x/branches/sca-android/itest/wires/src/main/resources/WireTest.composite
index 8b764d0e7d..8b764d0e7d 100644
--- a/branches/sca-android/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/wires/src/main/resources/WireTest.composite
diff --git a/branches/sca-android/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-1.x/branches/sca-android/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 95f721cd8e..95f721cd8e 100644
--- a/branches/sca-android/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
diff --git a/branches/sca-android/itest/ws-void-args-return/pom.xml b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/pom.xml
index 673a887758..673a887758 100644
--- a/branches/sca-android/itest/ws-void-args-return/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/pom.xml
diff --git a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/Bean.java b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
index 43e251369d..43e251369d 100644
--- a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
+++ b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/Bean.java
diff --git a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
index dc949b5191..dc949b5191 100644
--- a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
index 4777f793e0..4777f793e0 100644
--- a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
diff --git a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
index d549bccaf0..d549bccaf0 100644
--- a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
+++ b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
diff --git a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
index 1cdd094c50..1cdd094c50 100644
--- a/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
diff --git a/branches/sca-android/itest/ws-void-args-return/src/main/resources/voidtest.composite b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/resources/voidtest.composite
index 0f31c4cd2c..0f31c4cd2c 100644
--- a/branches/sca-android/itest/ws-void-args-return/src/main/resources/voidtest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/main/resources/voidtest.composite
diff --git a/branches/sca-android/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
index eaaa67c22c..eaaa67c22c 100644
--- a/branches/sca-android/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
diff --git a/branches/sca-android/itest/wsdl-multiple/pom.xml b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/pom.xml
index 4d65aaf25c..4d65aaf25c 100644
--- a/branches/sca-android/itest/wsdl-multiple/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/pom.xml
diff --git a/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
index 842ae0a692..842ae0a692 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldCallback.java
diff --git a/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
index d2d898e9c4..d2d898e9c4 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
index d4fbd434fe..d4fbd434fe 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
index a46f763960..a46f763960 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-android/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
index 9d9ed57cc7..9d9ed57cc7 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/resources/auto-wsdl.composite
diff --git a/branches/sca-android/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
index 0c1dc5d353..0c1dc5d353 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/resources/manual-wsdl.composite
diff --git a/branches/sca-android/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
index ea2f93c3e6..ea2f93c3e6 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldCallback.wsdl
diff --git a/branches/sca-android/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
index 1e50e146f2..1e50e146f2 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/main/resources/wsdl/helloworld.HelloWorldService.wsdl
diff --git a/branches/sca-android/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
index 6a872faa17..6a872faa17 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/AutoWSDLTestCase.java
diff --git a/branches/sca-android/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
index 5852f8d802..5852f8d802 100644
--- a/branches/sca-android/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl-multiple/src/test/java/org/apache/tuscany/sca/itest/ManualWSDLTestCase.java
diff --git a/branches/sca-android/itest/wsdl/pom.xml b/sca-java-1.x/branches/sca-android/itest/wsdl/pom.xml
index 9c48a604b5..9c48a604b5 100644
--- a/branches/sca-android/itest/wsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/pom.xml
diff --git a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 265b11f7dd..265b11f7dd 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index f8c9c28f26..f8c9c28f26 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index f16d20689d..f16d20689d 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index cba6f2ee6c..cba6f2ee6c 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 9f15be0236..9f15be0236 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index f174e1af07..f174e1af07 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 4a5b7bceef..4a5b7bceef 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
index c9076ebba6..c9076ebba6 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
index d706517b76..d706517b76 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 9d147dc013..9d147dc013 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 7556e02b36..7556e02b36 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index e7031ff41c..e7031ff41c 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index 7a049ed7b0..7a049ed7b0 100644
--- a/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-android/itest/wsdl/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/SDOWSDLTest.composite
index 62596ee62a..62596ee62a 100644
--- a/branches/sca-android/itest/wsdl/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-android/itest/wsdl/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/WSDLTest.composite
index 2024578dae..2024578dae 100644
--- a/branches/sca-android/itest/wsdl/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-android/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-android/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-android/itest/wsdl/src/main/resources/wsdl/Hello.xsd b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/wsdl/Hello.xsd
index 4fc5b10e7c..4fc5b10e7c 100644
--- a/branches/sca-android/itest/wsdl/src/main/resources/wsdl/Hello.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/wsdl/Hello.xsd
diff --git a/branches/sca-android/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
index 1966acc957..1966acc957 100644
--- a/branches/sca-android/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-android/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 12441753fb..12441753fb 100644
--- a/branches/sca-android/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-android/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-android/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index fd30d69c79..fd30d69c79 100644
--- a/branches/sca-android/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-android/itest/wsdl2java/pom.xml b/sca-java-1.x/branches/sca-android/itest/wsdl2java/pom.xml
index 4691ce1ace..4691ce1ace 100644
--- a/branches/sca-android/itest/wsdl2java/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl2java/pom.xml
diff --git a/branches/sca-android/itest/wsdl2java/src/test/resources/AccountService.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdl2java/src/test/resources/AccountService.wsdl
index 9e5650e7dd..9e5650e7dd 100644
--- a/branches/sca-android/itest/wsdl2java/src/test/resources/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl2java/src/test/resources/AccountService.wsdl
diff --git a/branches/sca-android/itest/wsdl2java/src/test/resources/EchoService.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdl2java/src/test/resources/EchoService.wsdl
index 50d580f299..50d580f299 100644
--- a/branches/sca-android/itest/wsdl2java/src/test/resources/EchoService.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl2java/src/test/resources/EchoService.wsdl
diff --git a/branches/sca-android/itest/wsdl2java/src/test/resources/EchoService.xsd b/sca-java-1.x/branches/sca-android/itest/wsdl2java/src/test/resources/EchoService.xsd
index 8069d4861f..8069d4861f 100644
--- a/branches/sca-android/itest/wsdl2java/src/test/resources/EchoService.xsd
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl2java/src/test/resources/EchoService.xsd
diff --git a/branches/sca-android/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
index c44229c162..c44229c162 100644
--- a/branches/sca-android/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdl2java/src/test/resources/StockExceptionTest.wsdl
diff --git a/branches/sca-android/itest/wsdlless/pom.xml b/sca-java-1.x/branches/sca-android/itest/wsdlless/pom.xml
index 08c84589ea..08c84589ea 100644
--- a/branches/sca-android/itest/wsdlless/pom.xml
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/pom.xml
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
index 5886ebc6ff..5886ebc6ff 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataService.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
index df658428fd..df658428fd 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
index d39df8c00e..d39df8c00e 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/AccountServiceClientImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
index d4a06780c3..d4a06780c3 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2aImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
index 6dc46c60b5..6dc46c60b5 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component2bImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
index 8471000152..8471000152 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3aImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
index 859c61a724..859c61a724 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/Component3bImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
index e747eb041f..e747eb041f 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/bigbank/account/services/accountdata/CustomerIdService.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
index ca7c25f3fa..ca7c25f3fa 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
index 8b234599aa..8b234599aa 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
index 03984f7252..03984f7252 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
index 45bb697437..45bb697437 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2aImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
index 9342c8e6ee..9342c8e6ee 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component2bImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
index 6c5ac96b67..6c5ac96b67 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3aImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
index ebaf33f568..ebaf33f568 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/org/apache/tuscany/sca/itest/Component3bImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/service/AnObject.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/service/AnObject.java
index 65ba52f356..65ba52f356 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/service/AnObject.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/service/AnObject.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/service/MoreComplexObject.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/service/MoreComplexObject.java
index 69eba6701d..69eba6701d 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/service/MoreComplexObject.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/service/MoreComplexObject.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/service/SomeService.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/service/SomeService.java
index f6aaacb23a..f6aaacb23a 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/service/SomeService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/service/SomeService.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/java/service/SomeServiceImpl.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
index 39a2131024..39a2131024 100644
--- a/branches/sca-android/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/java/service/SomeServiceImpl.java
diff --git a/branches/sca-android/itest/wsdlless/src/main/resources/SDOWSDLTest.composite b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
index 16d3806318..16d3806318 100644
--- a/branches/sca-android/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/SDOWSDLTest.composite
diff --git a/branches/sca-android/itest/wsdlless/src/main/resources/WSDLTest.composite b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/WSDLTest.composite
index e69cdbc282..e69cdbc282 100644
--- a/branches/sca-android/itest/wsdlless/src/main/resources/WSDLTest.composite
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/WSDLTest.composite
diff --git a/branches/sca-android/itest/wsdlless/src/main/resources/some.composite b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/some.composite
index 1b099239d1..1b099239d1 100644
--- a/branches/sca-android/itest/wsdlless/src/main/resources/some.composite
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/some.composite
diff --git a/branches/sca-android/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
index 73f9ed4bfc..73f9ed4bfc 100644
--- a/branches/sca-android/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/wsdl/AccountService.wsdl
diff --git a/branches/sca-android/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
index bc6fe0e89a..bc6fe0e89a 100644
--- a/branches/sca-android/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/main/resources/wsdl/helloworld.wsdl
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
index 33f541b21b..33f541b21b 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
index 82bf7ce650..82bf7ce650 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
index 7c62287c57..7c62287c57 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/SomeComponentTestCase.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/AnObject.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/AnObject.java
index effeb3c701..effeb3c701 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/AnObject.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/AnObject.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
index 284e961788..284e961788 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObject.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
index 4113aa1a0a..4113aa1a0a 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingMoreComplexObjectResponse.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingString.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
index 532b948b47..532b948b47 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingString.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
index 82bfb2d2aa..82bfb2d2aa 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/GetUsingStringResponse.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
index 61c7c6cb19..61c7c6cb19 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/MoreComplexObject.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
index 1ba0c497d9..1ba0c497d9 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/ObjectFactory.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/SomeService.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/SomeService.java
index 4a584a8da2..4a584a8da2 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/SomeService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/SomeService.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
index 44c2b67256..44c2b67256 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/SomeServiceService.java
diff --git a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/package-info.java b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/package-info.java
index d7b3fef82e..d7b3fef82e 100644
--- a/branches/sca-android/itest/wsdlless/src/test/java/service/generated/package-info.java
+++ b/sca-java-1.x/branches/sca-android/itest/wsdlless/src/test/java/service/generated/package-info.java
diff --git a/branches/sca-android/modules/assembly-xml/LICENSE b/sca-java-1.x/branches/sca-android/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/assembly-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/LICENSE
diff --git a/branches/sca-android/modules/assembly-xml/META-INF/README b/sca-java-1.x/branches/sca-android/modules/assembly-xml/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/assembly-xml/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/META-INF/README
diff --git a/branches/sca-android/modules/assembly-xml/NOTICE b/sca-java-1.x/branches/sca-android/modules/assembly-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/assembly-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/NOTICE
diff --git a/branches/sca-android/modules/assembly-xml/pom.xml b/sca-java-1.x/branches/sca-android/modules/assembly-xml/pom.xml
index cd439d3216..cd439d3216 100644
--- a/branches/sca-android/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/pom.xml
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 06b208540a..06b208540a 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index b07c91d1b3..b07c91d1b3 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index d0d11cd02b..d0d11cd02b 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 9727b89aab..9727b89aab 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index bc74773d85..bc74773d85 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 72744259f6..72744259f6 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 09ec7664ce..09ec7664ce 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index aa4980fcb6..aa4980fcb6 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 3bf5a1173b..3bf5a1173b 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 4c5d6f8f49..4c5d6f8f49 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index 7dd95e3944..7dd95e3944 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index 334b6c6b97..334b6c6b97 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index a63ccdf151..a63ccdf151 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index fc4e10654d..fc4e10654d 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7a190dea9c..7a190dea9c 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 403c049b48..403c049b48 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-android/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
index 95edf89e30..95edf89e30 100644
--- a/branches/sca-android/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index 5f8f976b84..5f8f976b84 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index e2aeb85d32..e2aeb85d32 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 111a517552..111a517552 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 1aede413a5..1aede413a5 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
index 9b88ad3a3d..9b88ad3a3d 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAttributeTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index 32a2d94220..32a2d94220 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index df09a56c38..df09a56c38 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index 691145a30e..691145a30e 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
index 16cefc58cf..16cefc58cf 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnkonwnElement.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnkonwnElement.java
index 3c1d9ba88e..3c1d9ba88e 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnkonwnElement.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestReadWriteUnkonwnElement.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index c423df6f7d..c423df6f7d 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index af25109de1..af25109de1 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 76361d4b70..76361d4b70 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index b859779437..b859779437 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
index 5188b1c91a..5188b1c91a 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 85f6a39243..85f6a39243 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
index 3c69d0ed67..3c69d0ed67 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorExtended.composite
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index d67ba3ec2b..d67ba3ec2b 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index 2719ee9162..2719ee9162 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index d29fe85586..d29fe85586 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 7bc7ccdb83..7bc7ccdb83 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bcc8c54dc8..bcc8c54dc8 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index b79cb6b7b7..b79cb6b7b7 100644
--- a/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/branches/sca-android/modules/assembly-xsd/LICENSE b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/LICENSE
index bfded7c6a9..bfded7c6a9 100644
--- a/branches/sca-android/modules/assembly-xsd/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/LICENSE
diff --git a/branches/sca-android/modules/assembly-xsd/META-INF/README b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/assembly-xsd/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/META-INF/README
diff --git a/branches/sca-android/modules/assembly-xsd/NOTICE b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-android/modules/assembly-xsd/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/NOTICE
diff --git a/branches/sca-android/modules/assembly-xsd/pom.xml b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/pom.xml
index 90bb93222d..90bb93222d 100644
--- a/branches/sca-android/modules/assembly-xsd/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/pom.xml
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 69b2701e30..69b2701e30 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-all.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-all.xsd
index 82899ed8ed..82899ed8ed 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-all.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-all.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
index 6f64453635..6f64453635 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-contributions.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
index a22d8ac075..a22d8ac075 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-core.xsd
index a7ca0433f9..a7ca0433f9 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-core.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
index a7e781b18f..a7e781b18f 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
index a1adf10fd9..a1adf10fd9 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-policy.xsd
index 2c4875f36c..2c4875f36c 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-policy.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca-policy.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca.xsd
index 88edad794c..88edad794c 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/sca.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/sca.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
index 4331da0439..4331da0439 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
index 1f6f9abb16..1f6f9abb16 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
index 4a06bdd36a..4a06bdd36a 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
index 032143bd13..032143bd13 100644
--- a/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
diff --git a/branches/sca-android/modules/assembly/LICENSE b/sca-java-1.x/branches/sca-android/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/assembly/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/LICENSE
diff --git a/branches/sca-android/modules/assembly/META-INF/README b/sca-java-1.x/branches/sca-android/modules/assembly/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/assembly/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/META-INF/README
diff --git a/branches/sca-android/modules/assembly/NOTICE b/sca-java-1.x/branches/sca-android/modules/assembly/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/assembly/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/NOTICE
diff --git a/branches/sca-android/modules/assembly/pom.xml b/sca-java-1.x/branches/sca-android/modules/assembly/pom.xml
index 5257d7ef63..5257d7ef63 100644
--- a/branches/sca-android/modules/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/pom.xml
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index b8487d95c5..b8487d95c5 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 05f0e60981..05f0e60981 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 8a4fc6dfda..8a4fc6dfda 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index f8b7d4d236..f8b7d4d236 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index f49a653aa9..f49a653aa9 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 8e1943224c..8e1943224c 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 13d19b1757..13d19b1757 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index ce40bc089b..ce40bc089b 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index e1ea65ea39..e1ea65ea39 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 2c7b7c6b9e..2c7b7c6b9e 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index 8832597343..8832597343 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 9890bfed68..9890bfed68 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index f9a62774e6..f9a62774e6 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
index 6b0c076ee5..6b0c076ee5 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index ee63497fbe..ee63497fbe 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
index 93e6c4d630..93e6c4d630 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 3577a94d1e..3577a94d1e 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 720a6801a2..720a6801a2 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 947fcd4c7c..947fcd4c7c 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 98ff92f15b..98ff92f15b 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 683920da58..683920da58 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 2eb1bf21b0..2eb1bf21b0 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 020870cd34..020870cd34 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index ee65e5746e..ee65e5746e 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
index 97708f9ef5..97708f9ef5 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 7bac630d5b..7bac630d5b 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
index 37ad8af0b3..37ad8af0b3 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index d2fae4d24a..d2fae4d24a 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index cf38894702..cf38894702 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
index 9743117174..9743117174 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 20a17e1bd0..20a17e1bd0 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
index eb2977d87a..eb2977d87a 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
index 6f856986ad..6f856986ad 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseConfigurationBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
index 0c2d02ab48..0c2d02ab48 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
index 4016d02a36..4016d02a36 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingConfigurationUtil.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
index 0643421a45..0643421a45 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
index 4913705e91..4913705e91 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
index c0702c87b3..c0702c87b3 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
index 927330b139..927330b139 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
index 12ea86eac3..12ea86eac3 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
index d73286f7ab..d73286f7ab 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
index 85af173c0d..85af173c0d 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index 282fe032ba..282fe032ba 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index 5779ddbc78..5779ddbc78 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index 539ad8d137..539ad8d137 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
index 76ed861167..76ed861167 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
index 5a6437b3a3..5a6437b3a3 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
index 41462b151d..41462b151d 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
index 8aa1897311..8aa1897311 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
index 3aa9f3bf85..3aa9f3bf85 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
index a3f31ea2fa..a3f31ea2fa 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
index ea0e88ac24..ea0e88ac24 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
index 1698b1a9c7..1698b1a9c7 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
index 944cf2cf36..944cf2cf36 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
index c0bc18dfaf..c0bc18dfaf 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index e85aec8cea..e85aec8cea 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index 03f24dfae8..03f24dfae8 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
index 0105d4af50..0105d4af50 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
index 23d547efaf..23d547efaf 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
index 41a8b3f8ba..41a8b3f8ba 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index b7c63dc2b4..b7c63dc2b4 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 016a9a5b05..016a9a5b05 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 4082d81fdb..4082d81fdb 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 34429a6703..34429a6703 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e2e7b59896..e2e7b59896 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 488023090c..488023090c 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index bbe665d52f..bbe665d52f 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index a0ec95023a..a0ec95023a 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 1373ce511b..1373ce511b 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index d5701df74e..d5701df74e 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 491c835246..491c835246 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
index ece51cbe9b..ece51cbe9b 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 5748abb07d..5748abb07d 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 9a7ca09e43..9a7ca09e43 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index aa75922489..aa75922489 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 0c1051199f..0c1051199f 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 1800222bfb..1800222bfb 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 8d745cb7e1..8d745cb7e1 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 1a7abc8564..1a7abc8564 100644
--- a/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
index 8dbff76ad9..8dbff76ad9 100644
--- a/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
diff --git a/branches/sca-android/modules/assembly/src/main/resources/assembly-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/resources/assembly-validation-messages.properties
index 6aeda18aab..6aeda18aab 100644
--- a/branches/sca-android/modules/assembly/src/main/resources/assembly-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/resources/assembly-validation-messages.properties
diff --git a/branches/sca-android/modules/assembly/src/main/resources/assembly-validation-messages_it.properties b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
index b94d37ba2d..b94d37ba2d 100644
--- a/branches/sca-android/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
diff --git a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 8a3a89aba4..8a3a89aba4 100644
--- a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 5e0a2335d1..5e0a2335d1 100644
--- a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 19702954c9..19702954c9 100644
--- a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index fabafc998b..fabafc998b 100644
--- a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index 82b1fd8665..82b1fd8665 100644
--- a/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
diff --git a/branches/sca-android/modules/binding-sca-xml/LICENSE b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/binding-sca-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/LICENSE
diff --git a/branches/sca-android/modules/binding-sca-xml/META-INF/README b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/binding-sca-xml/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/META-INF/README
diff --git a/branches/sca-android/modules/binding-sca-xml/NOTICE b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/binding-sca-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/NOTICE
diff --git a/branches/sca-android/modules/binding-sca-xml/pom.xml b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/pom.xml
index e27926d1ab..e27926d1ab 100644
--- a/branches/sca-android/modules/binding-sca-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/pom.xml
diff --git a/branches/sca-android/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
index a3e582c82e..a3e582c82e 100644
--- a/branches/sca-android/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/main/java/org/apache/tuscany/sca/binding/sca/xml/SCABindingProcessor.java
diff --git a/branches/sca-android/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bc9f9b7d62..bc9f9b7d62 100644
--- a/branches/sca-android/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
index a7c7c15eaa..a7c7c15eaa 100644
--- a/branches/sca-android/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/branches/sca-android/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index 8ceaecc9c7..8ceaecc9c7 100644
--- a/branches/sca-android/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/branches/sca-android/modules/binding-sca-xml/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/test/resources/Calculator.composite
index 9028662d05..9028662d05 100644
--- a/branches/sca-android/modules/binding-sca-xml/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/test/resources/Calculator.composite
diff --git a/branches/sca-android/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
index f02e7d6fc0..f02e7d6fc0 100644
--- a/branches/sca-android/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca-xml/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/branches/sca-android/modules/binding-sca/LICENSE b/sca-java-1.x/branches/sca-android/modules/binding-sca/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/binding-sca/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/LICENSE
diff --git a/branches/sca-android/modules/binding-sca/META-INF/README b/sca-java-1.x/branches/sca-android/modules/binding-sca/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/binding-sca/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/META-INF/README
diff --git a/branches/sca-android/modules/binding-sca/NOTICE b/sca-java-1.x/branches/sca-android/modules/binding-sca/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/binding-sca/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/NOTICE
diff --git a/branches/sca-android/modules/binding-sca/pom.xml b/sca-java-1.x/branches/sca-android/modules/binding-sca/pom.xml
index c8af2d4628..c8af2d4628 100644
--- a/branches/sca-android/modules/binding-sca/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/pom.xml
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
index 167c93e86d..167c93e86d 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
index bd24d4b14c..bd24d4b14c 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
index 43b0cd8f4e..43b0cd8f4e 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
index 86629fb378..86629fb378 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
index 5c1cefb808..5c1cefb808 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
index 5dda74f72e..5dda74f72e 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
index 850fd77e96..850fd77e96 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
index 8994ba5381..8994ba5381 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
index ea758823a9..ea758823a9 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
index c93ddd9503..c93ddd9503 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
index 52c0f64fe5..52c0f64fe5 100644
--- a/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
diff --git a/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 4efa03a933..4efa03a933 100644
--- a/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 5c6b8e21fc..5c6b8e21fc 100644
--- a/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index 22c9a64b05..22c9a64b05 100644
--- a/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/branches/sca-android/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 8bac9e01c9..8bac9e01c9 100644
--- a/branches/sca-android/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-android/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index ff396566d6..ff396566d6 100644
--- a/branches/sca-android/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/branches/sca-android/modules/binding-sca/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/test/resources/Calculator.composite
index 37b26f3d68..37b26f3d68 100644
--- a/branches/sca-android/modules/binding-sca/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/binding-sca/src/test/resources/Calculator.composite
diff --git a/branches/sca-android/modules/contribution-impl/LICENSE b/sca-java-1.x/branches/sca-android/modules/contribution-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/contribution-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/LICENSE
diff --git a/branches/sca-android/modules/contribution-impl/META-INF/README b/sca-java-1.x/branches/sca-android/modules/contribution-impl/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/contribution-impl/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/META-INF/README
diff --git a/branches/sca-android/modules/contribution-impl/NOTICE b/sca-java-1.x/branches/sca-android/modules/contribution-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/contribution-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/NOTICE
diff --git a/branches/sca-android/modules/contribution-impl/pom.xml b/sca-java-1.x/branches/sca-android/modules/contribution-impl/pom.xml
index ff83cff49c..ff83cff49c 100644
--- a/branches/sca-android/modules/contribution-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/pom.xml
diff --git a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
index ab056e3214..ab056e3214 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
diff --git a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
index 3df275a7a1..3df275a7a1 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
diff --git a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
index 9375cb917f..9375cb917f 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionRepositoryImpl.java
diff --git a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
index 7b8b12ca9d..7b8b12ca9d 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
diff --git a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
index 9f04c4af27..9f04c4af27 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/PackageTypeDescriberImpl.java
diff --git a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
index cd5e87ca42..cd5e87ca42 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
diff --git a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
index 630d1f6bf4..630d1f6bf4 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
diff --git a/branches/sca-android/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
index b644709266..b644709266 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
diff --git a/branches/sca-android/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
index 158ee2102d..158ee2102d 100644
--- a/branches/sca-android/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/main/resources/contribution-impl-validation-messages.properties
diff --git a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
index c33b31b550..c33b31b550 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/FolderContributionPackageProcessorTestCase.java
diff --git a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
index 9b3dce7029..9b3dce7029 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/JarContributionPackageProcessorTestCase.java
diff --git a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index 46b4183380..46b4183380 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
index 98852e951c..98852e951c 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
index 01083cc6a6..01083cc6a6 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
index 66ecd33da6..66ecd33da6 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
index 2e5354fb96..2e5354fb96 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/ContributionRepositoryTestCase.java
diff --git a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
index dfb600153e..dfb600153e 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/java/org/apache/tuscany/sca/contribution/services/PackageTypeDescriberImplTestCase.java
diff --git a/branches/sca-android/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-android/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/branches/sca-android/modules/contribution-impl/src/test/resources/test.composite b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/resources/test.composite
diff --git a/branches/sca-android/modules/contribution-impl/src/test/resources/test.ext b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/resources/test.ext
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-android/modules/contribution-impl/src/test/resources/test.ext
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-impl/src/test/resources/test.ext
diff --git a/branches/sca-android/modules/contribution-java/LICENSE b/sca-java-1.x/branches/sca-android/modules/contribution-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/contribution-java/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/LICENSE
diff --git a/branches/sca-android/modules/contribution-java/META-INF/README b/sca-java-1.x/branches/sca-android/modules/contribution-java/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/contribution-java/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/META-INF/README
diff --git a/branches/sca-android/modules/contribution-java/NOTICE b/sca-java-1.x/branches/sca-android/modules/contribution-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/contribution-java/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/NOTICE
diff --git a/branches/sca-android/modules/contribution-java/pom.xml b/sca-java-1.x/branches/sca-android/modules/contribution-java/pom.xml
index 153a4f7c5e..153a4f7c5e 100644
--- a/branches/sca-android/modules/contribution-java/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/pom.xml
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
index 886c61c00a..886c61c00a 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
index 41e93ec148..41e93ec148 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
index d3568f6283..d3568f6283 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
index af2ca9cd57..af2ca9cd57 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
index 61c73bf2f8..61c73bf2f8 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
index 962512a745..962512a745 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
index aa68925376..aa68925376 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
index f35f35ac4c..f35f35ac4c 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
index 8d5412f6d7..8d5412f6d7 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index 9f6ff52289..9f6ff52289 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
index e5dc397f4e..e5dc397f4e 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
index 47cdc9767b..47cdc9767b 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportListener.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
index cc18d5f798..cc18d5f798 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
index 484eddd222..484eddd222 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index d027d75b32..d027d75b32 100644
--- a/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
index a293330a57..a293330a57 100644
--- a/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
diff --git a/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ac1fa9aade..ac1fa9aade 100644
--- a/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index c69eb40636..c69eb40636 100644
--- a/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
index 7debb3d3c6..7debb3d3c6 100644
--- a/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
diff --git a/branches/sca-android/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
index 70b58f75c0..70b58f75c0 100644
--- a/branches/sca-android/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/main/resources/contribution-java-validation-messages.properties
diff --git a/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
index 1405ad4bd5..1405ad4bd5 100644
--- a/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceArtifactResolverTestCase.java
diff --git a/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
index 3ae161642d..3ae161642d 100644
--- a/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
diff --git a/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index 0ec5bfba39..0ec5bfba39 100644
--- a/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index 9e43b744cf..9e43b744cf 100644
--- a/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/branches/sca-android/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/branches/sca-android/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-java/src/test/resources/deployables/sample-calculator.jar
diff --git a/branches/sca-android/modules/contribution-xml/LICENSE b/sca-java-1.x/branches/sca-android/modules/contribution-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/contribution-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/LICENSE
diff --git a/branches/sca-android/modules/contribution-xml/META-INF/README b/sca-java-1.x/branches/sca-android/modules/contribution-xml/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/contribution-xml/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/META-INF/README
diff --git a/branches/sca-android/modules/contribution-xml/NOTICE b/sca-java-1.x/branches/sca-android/modules/contribution-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/contribution-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/NOTICE
diff --git a/branches/sca-android/modules/contribution-xml/pom.xml b/sca-java-1.x/branches/sca-android/modules/contribution-xml/pom.xml
index b1a06c2d11..b1a06c2d11 100644
--- a/branches/sca-android/modules/contribution-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/pom.xml
diff --git a/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
index a4cf1b3566..a4cf1b3566 100644
--- a/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
diff --git a/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
index e2e97239e0..e2e97239e0 100644
--- a/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
diff --git a/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index 3f5aacb541..3f5aacb541 100644
--- a/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
diff --git a/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
index f226dbbee3..f226dbbee3 100644
--- a/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
diff --git a/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b73c380370..b73c380370 100644
--- a/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 23adab56b9..23adab56b9 100644
--- a/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 68030bf6e6..68030bf6e6 100644
--- a/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-android/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
index 3e1a0187fe..3e1a0187fe 100644
--- a/branches/sca-android/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/main/resources/contribution-xml-validation-messages.properties
diff --git a/branches/sca-android/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index 8f69f15cd1..8f69f15cd1 100644
--- a/branches/sca-android/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution-xml/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
diff --git a/branches/sca-android/modules/contribution/LICENSE b/sca-java-1.x/branches/sca-android/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/contribution/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/LICENSE
diff --git a/branches/sca-android/modules/contribution/META-INF/README b/sca-java-1.x/branches/sca-android/modules/contribution/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/contribution/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/META-INF/README
diff --git a/branches/sca-android/modules/contribution/NOTICE b/sca-java-1.x/branches/sca-android/modules/contribution/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/contribution/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/NOTICE
diff --git a/branches/sca-android/modules/contribution/pom.xml b/sca-java-1.x/branches/sca-android/modules/contribution/pom.xml
index 5a1c4b55b5..5a1c4b55b5 100644
--- a/branches/sca-android/modules/contribution/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/pom.xml
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index 7400501d85..7400501d85 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
index 4cf20125b9..4cf20125b9 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Constants.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 81b0b08b9d..81b0b08b9d 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index 743c2356d7..743c2356d7 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index 67c9a05a0b..67c9a05a0b 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
index 4043fb9eda..4043fb9eda 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
index 98954c288a..98954c288a 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
index b2eddb8336..b2eddb8336 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
index 20798dcd17..20798dcd17 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
index b69c58a0ff..b69c58a0ff 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
index ffe190132c..ffe190132c 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DeployedArtifact.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index bfa16b1ce3..bfa16b1ce3 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 35076f55a7..35076f55a7 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
index 0ada4ebec3..0ada4ebec3 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index c0dd5431d7..c0dd5431d7 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index 881987f622..881987f622 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index c678c2eaef..c678c2eaef 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index fc9ae607e7..fc9ae607e7 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
index 75b12b1260..75b12b1260 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
index e67395337a..e67395337a 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
index 17c09f2cbc..17c09f2cbc 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index b5f536c431..b5f536c431 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
index 029df61f0f..029df61f0f 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index f23797a831..f23797a831 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index 3c67a8c550..3c67a8c550 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
index 426d7beb29..426d7beb29 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultPackageProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index f23ebc2c36..f23ebc2c36 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
index d81e236b40..d81e236b40 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index 045c201638..045c201638 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java
index d52a110c05..d52a110c05 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
index 7be5566113..7be5566113 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index a6631f498e..a6631f498e 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
index 7ed2d45c2f..7ed2d45c2f 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index ca5c36fe98..ca5c36fe98 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
index 3329f0bf1c..3329f0bf1c 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index 2fa9469b93..2fa9469b93 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
index f17f31edb1..f17f31edb1 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
index ed99239b19..ed99239b19 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/PackageProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index fcf9347564..fcf9347564 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index 9700e2bc60..9700e2bc60 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
index e8edb743a4..e8edb743a4 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
index ebad243c1c..ebad243c1c 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index 2ecddf5465..2ecddf5465 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index 7714586951..7714586951 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
index da249a09e4..da249a09e4 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index c136c62d33..c136c62d33 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
index cc3bb59a5b..cc3bb59a5b 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index f3555ee71e..f3555ee71e 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
index 13c622adf0..13c622adf0 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
index c6facd2b02..c6facd2b02 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
index 9ae57c41d0..9ae57c41d0 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
index bf175813f3..bf175813f3 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index 77570aa13d..77570aa13d 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index de54d54f94..de54d54f94 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index 2831bebbc4..2831bebbc4 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
index 4a25059792..4a25059792 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
index 74f0f2d71d..74f0f2d71d 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
index 2394f4510b..2394f4510b 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index 2d03381c8a..2d03381c8a 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
index 1ca9def4ea..1ca9def4ea 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index 24aae45b59..24aae45b59 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
index e183206894..e183206894 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
index 5158eaf85c..5158eaf85c 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListener.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
index ce2b4b13c3..ce2b4b13c3 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionListenerExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
index 33399dcc2f..33399dcc2f 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionReadException.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
index d7d8216f66..d7d8216f66 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRepository.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
index ecb774ac0c..ecb774ac0c 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionResolveException.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
index 4bf29a3993..4bf29a3993 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionRuntimeException.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
index dcdb8733b8..dcdb8733b8 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionService.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
index 8bfdedf180..8bfdedf180 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWriteException.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
index 1ab80e344b..1ab80e344b 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/DefaultContributionListenerExtensionPoint.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
index fc0dc3aa99..fc0dc3aa99 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ExtensibleContributionListener.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
index 74f303a5a5..74f303a5a5 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/TypeDescriber.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
index ff21c894de..ff21c894de 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnrecognizedElementException.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
index 0660d69897..0660d69897 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
diff --git a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
index 33c847a049..33c847a049 100644
--- a/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
index bcc346d9f8..bcc346d9f8 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
index 6b4d2ebdeb..6b4d2ebdeb 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
index 9e6433ba6c..9e6433ba6c 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ContributionPostProcessorExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
index 7609eda0d1..7609eda0d1 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessorExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
index 8ea5fc0a7e..8ea5fc0a7e 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
index 607725bcfe..607725bcfe 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
index 9d78ca93d0..9d78ca93d0 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
index ae6e876df6..ae6e876df6 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
index 4bb65e55e7..4bb65e55e7 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
index 727f8f6ce7..727f8f6ce7 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
index 6e61bebf79..6e61bebf79 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListenerExtensionPoint
diff --git a/branches/sca-android/modules/contribution/src/main/resources/contribution-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/contribution-validation-messages.properties
index bd650fe457..bd650fe457 100644
--- a/branches/sca-android/modules/contribution/src/main/resources/contribution-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/contribution/src/main/resources/contribution-validation-messages.properties
diff --git a/branches/sca-android/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-android/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/LICENSE
diff --git a/branches/sca-android/modules/core-databinding/META-INF/README b/sca-java-1.x/branches/sca-android/modules/core-databinding/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/core-databinding/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/META-INF/README
diff --git a/branches/sca-android/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-android/modules/core-databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/NOTICE
diff --git a/branches/sca-android/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-android/modules/core-databinding/pom.xml
index cb88bcd176..cb88bcd176 100644
--- a/branches/sca-android/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/pom.xml
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index 2056789089..2056789089 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index e182b472d4..e182b472d4 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index 38ca2cd10c..38ca2cd10c 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
index 124928db24..124928db24 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
index 012950e215..012950e215 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
index 97629ea7b5..97629ea7b5 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceTypeHelper.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
index ff6e444dcd..ff6e444dcd 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 6e2e714bdb..6e2e714bdb 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index fb5f939edb..fb5f939edb 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 8d586905c4..8d586905c4 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
index 841efa9398..841efa9398 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index b41c7fb012..b41c7fb012 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 5814f3d215..5814f3d215 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index 3586f54d71..3586f54d71 100644
--- a/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-android/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-android/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index b0c39e18ef..b0c39e18ef 100644
--- a/branches/sca-android/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-android/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
index 7d49fb7112..7d49fb7112 100644
--- a/branches/sca-android/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
diff --git a/branches/sca-android/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-android/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/LICENSE
diff --git a/branches/sca-android/modules/core-spi/META-INF/README b/sca-java-1.x/branches/sca-android/modules/core-spi/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/core-spi/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/META-INF/README
diff --git a/branches/sca-android/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-android/modules/core-spi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/NOTICE
diff --git a/branches/sca-android/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-android/modules/core-spi/pom.xml
index 6246686d08..6246686d08 100644
--- a/branches/sca-android/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/pom.xml
diff --git a/branches/sca-android/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-android/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-android/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index ed4b57639c..ed4b57639c 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index e92a8f2844..e92a8f2844 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 5a0aefe55d..5a0aefe55d 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index 9766e164b8..9766e164b8 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 546757c766..546757c766 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
index 2849c27c1a..2849c27c1a 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
index 79a10f6d84..79a10f6d84 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
index fdd304a9c7..fdd304a9c7 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
index be55981131..be55981131 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 992c1188f7..992c1188f7 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index d17aebd7e8..d17aebd7e8 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index f209eb8936..f209eb8936 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index b34dceee62..b34dceee62 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index f888908340..f888908340 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 75719bb0cc..75719bb0cc 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index a727693132..a727693132 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 38c900e36a..38c900e36a 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index 2deb273f84..2deb273f84 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3887db4873..3887db4873 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index dfc3ddb468..dfc3ddb468 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
index 068d0d12d7..068d0d12d7 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 015c673d66..015c673d66 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index 644283dea1..644283dea1 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index b60a14d2da..b60a14d2da 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index d8f9973338..d8f9973338 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index b3ab1d8b87..b3ab1d8b87 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
index bd0f4d4b75..bd0f4d4b75 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
index b05130d6c8..b05130d6c8 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
index a5d60cc6eb..a5d60cc6eb 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e15234a549..e15234a549 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index b6fafa5fb6..b6fafa5fb6 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 0e19538aff..0e19538aff 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index 30bba78a40..30bba78a40 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 801bb9e294..801bb9e294 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 44ae7f552a..44ae7f552a 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 982724d798..982724d798 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index da37385af1..da37385af1 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 7d5cd6c54b..7d5cd6c54b 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 9d965a3369..9d965a3369 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index b15cde066a..b15cde066a 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 24eaddd3e0..24eaddd3e0 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 5c1a3ca79d..5c1a3ca79d 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 4bc7facf39..4bc7facf39 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index c2346bddca..c2346bddca 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index b37519b31c..b37519b31c 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index d32af450ff..d32af450ff 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index b1beac78e2..b1beac78e2 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index 18ec2dfeaa..18ec2dfeaa 100644
--- a/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
index ddd91bceac..ddd91bceac 100644
--- a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
diff --git a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
index 91839e998f..91839e998f 100644
--- a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
diff --git a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
index 2f700671ca..2f700671ca 100644
--- a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-android/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
index 3a27569a3b..3a27569a3b 100644
--- a/branches/sca-android/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/branches/sca-android/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java b/sca-java-1.x/branches/sca-android/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
index 2425133273..2425133273 100644
--- a/branches/sca-android/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
diff --git a/branches/sca-android/modules/core/LICENSE b/sca-java-1.x/branches/sca-android/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/core/LICENSE
diff --git a/branches/sca-android/modules/core/META-INF/README b/sca-java-1.x/branches/sca-android/modules/core/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/core/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/core/META-INF/README
diff --git a/branches/sca-android/modules/core/NOTICE b/sca-java-1.x/branches/sca-android/modules/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/core/NOTICE
diff --git a/branches/sca-android/modules/core/pom.xml b/sca-java-1.x/branches/sca-android/modules/core/pom.xml
index b71f001d06..b71f001d06 100644
--- a/branches/sca-android/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/core/pom.xml
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 29dcc20f0b..29dcc20f0b 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index f51931c53b..f51931c53b 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 78096b20ab..78096b20ab 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
index c25c580fe6..c25c580fe6 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index c82543c4ca..c82543c4ca 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index 14a5f565fc..14a5f565fc 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index b174dea6ce..b174dea6ce 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index 32ac611e54..32ac611e54 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index b386495a08..b386495a08 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index af5230a163..af5230a163 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index 58109fd86b..58109fd86b 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index fc6d7abf6a..fc6d7abf6a 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index 78b0887482..78b0887482 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index ed01a509d2..ed01a509d2 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..c5b68389b2 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index b577180291..b577180291 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index aa69bb3ae5..aa69bb3ae5 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 1d178421cf..1d178421cf 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index efa362a929..efa362a929 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index 28e22b4f2c..28e22b4f2c 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index 8a883f8e15..8a883f8e15 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index 03c18c26b8..03c18c26b8 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index 0bf66b2817..0bf66b2817 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 45eab7da1b..45eab7da1b 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index 4dc79c3844..4dc79c3844 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index d3106c7052..d3106c7052 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index 123400fbdd..123400fbdd 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 68cb5c2966..68cb5c2966 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 38a4fb10d6..38a4fb10d6 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index d7e797bbb9..d7e797bbb9 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 7530156b11..7530156b11 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 588c43b8b1..588c43b8b1 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index d19aa237cd..d19aa237cd 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index 97c69c33cb..97c69c33cb 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index b5b40811ad..b5b40811ad 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 0fa1d27d2a..0fa1d27d2a 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 9acb4be6f8..9acb4be6f8 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index fcb48259b9..fcb48259b9 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index c26501e7d7..c26501e7d7 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index cade0499d3..cade0499d3 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index a23b9af9ad..a23b9af9ad 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index 0992638318..0992638318 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index 7d7fc583c3..7d7fc583c3 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index 733544d387..733544d387 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 60f90fb6b5..60f90fb6b5 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index 94d67bffcc..94d67bffcc 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index fc4bea3d9f..fc4bea3d9f 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cb836e42c1..cb836e42c1 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 875a252798..875a252798 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index c007669bdf..c007669bdf 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 2c4d657882..2c4d657882 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 504bd9b036..504bd9b036 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 246f9c45d6..246f9c45d6 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 1168d1d0dd..1168d1d0dd 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 7e7ab7a9e4..7e7ab7a9e4 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 786988613b..786988613b 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 3ae1ca51c5..3ae1ca51c5 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index a6663aba09..a6663aba09 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 5ae8b94647..5ae8b94647 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index 49f89661b1..49f89661b1 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index f11a61e662..f11a61e662 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 1cfb6b06a4..1cfb6b06a4 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 6b2980b989..6b2980b989 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 75261e11a8..75261e11a8 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 85a6626cdd..85a6626cdd 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index a2c0edb9b4..a2c0edb9b4 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 0471b2c52e..0471b2c52e 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index adeb667277..adeb667277 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index 90c13e6da8..90c13e6da8 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index fb47a65edf..fb47a65edf 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 67d2b66f84..67d2b66f84 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index 170319b6e6..170319b6e6 100644
--- a/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 5f54178483..5f54178483 100644
--- a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
index 898054509b..898054509b 100644
--- a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
diff --git a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
index af281d8f4d..af281d8f4d 100644
--- a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
diff --git a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
index bcbd5b0abf..bcbd5b0abf 100644
--- a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index 7b44736d4b..7b44736d4b 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index 2bc78c3d35..2bc78c3d35 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 48dcf8df07..48dcf8df07 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index 99d5ec7bc9..99d5ec7bc9 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index 61164fa2de..61164fa2de 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 64114f7fb2..64114f7fb2 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index d46d77b4b8..d46d77b4b8 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 1aba9656d8..1aba9656d8 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 1ad0927d16..1ad0927d16 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index b8150d4edc..b8150d4edc 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
index 3184c3de92..3184c3de92 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
index 91b45dfbcb..91b45dfbcb 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
index a7617f7a70..a7617f7a70 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
index 75840efef4..75840efef4 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
index 225f23cb93..225f23cb93 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
index ba32a92c18..ba32a92c18 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
index 715f5f95c0..715f5f95c0 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
index 3b30d86f14..3b30d86f14 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
diff --git a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 341d889b7d..341d889b7d 100644
--- a/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-1.x/branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index 9ed0928a33..9ed0928a33 100644
--- a/branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-1.x/branches/sca-android/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/branches/sca-android/modules/databinding/LICENSE b/sca-java-1.x/branches/sca-android/modules/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/branches/sca-android/modules/databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/LICENSE
diff --git a/branches/sca-android/modules/databinding/META-INF/README b/sca-java-1.x/branches/sca-android/modules/databinding/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/databinding/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/META-INF/README
diff --git a/branches/sca-android/modules/databinding/NOTICE b/sca-java-1.x/branches/sca-android/modules/databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/NOTICE
diff --git a/branches/sca-android/modules/databinding/pom.xml b/sca-java-1.x/branches/sca-android/modules/databinding/pom.xml
index 890abcc2ea..890abcc2ea 100644
--- a/branches/sca-android/modules/databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/pom.xml
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index 547f9d9f4f..547f9d9f4f 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index 2ff5d866b4..2ff5d866b4 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 505a810276..505a810276 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 1aac6d48be..1aac6d48be 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index b2da024a72..b2da024a72 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 7aa55d2cff..7aa55d2cff 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index 6b8acfc7b4..6b8acfc7b4 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index 81264923eb..81264923eb 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 600a6477f6..600a6477f6 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 4e6d130aa9..4e6d130aa9 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 9ffadd1eae..9ffadd1eae 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index 4f949f7dff..4f949f7dff 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 2aa0ad7c15..2aa0ad7c15 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index ee7efe4860..ee7efe4860 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index a91410ed71..a91410ed71 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
index e940f8675f..e940f8675f 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 4405077e29..4405077e29 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
index 650e909c61..650e909c61 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index 640a43f55d..640a43f55d 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
index 4bbcf7ddef..4bbcf7ddef 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
index 94a2cdb0bb..94a2cdb0bb 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
index 64b3d22c10..64b3d22c10 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DOMHelper.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index 01916dfb96..01916dfb96 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index cc7b40d06b..cc7b40d06b 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 4a918488c5..4a918488c5 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index 45896ca6a1..45896ca6a1 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index b7ddf87a41..b7ddf87a41 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index a1a89005b3..a1a89005b3 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index c91176fc2c..c91176fc2c 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index 32a2313f59..32a2313f59 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index a6c0639411..a6c0639411 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index fb747864e7..fb747864e7 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index 2f95c2a9c6..2f95c2a9c6 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index 9615f43572..9615f43572 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index 58f594751a..58f594751a 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 4942fef0da..4942fef0da 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index b96b394bb8..b96b394bb8 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index fb04014051..fb04014051 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
index 7ae64c6a27..7ae64c6a27 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index 11c82e062c..11c82e062c 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 06feeffabd..06feeffabd 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index a723fd445c..a723fd445c 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
index 1e39150f4a..1e39150f4a 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
index 34a82fd2d3..34a82fd2d3 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/LRUCache.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
index 3423d3e3b0..3423d3e3b0 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index 92058d769f..92058d769f 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 9e1ebb3522..9e1ebb3522 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
index 8c7a742cdd..8c7a742cdd 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXMLStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
index 507c141c33..507c141c33 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMXmlNodeImpl.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
index 7f49a50e1e..7f49a50e1e 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DelegatingNamespaceContext.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 5f583da283..5f583da283 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index 39116ba4a1..39116ba4a1 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index e40c3006fb..e40c3006fb 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index 3b7bd3088a..3b7bd3088a 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
index 5a31d9db91..5a31d9db91 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValueArrayStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
index fdc3c4139b..fdc3c4139b 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NameValuePairStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
index 04d7d65a0d..04d7d65a0d 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NamedProperty.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
index abc4bf3785..abc4bf3785 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/NilElementStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 5500d0bcca..5500d0bcca 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index d5bf7e76b5..d5bf7e76b5 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
index 3c9022bc3c..3c9022bc3c 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index 1b54b1fd1e..1b54b1fd1e 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index c9631595dc..c9631595dc 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 1e8d14a151..1e8d14a151 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index 70387fa862..70387fa862 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index 188ecaffa3..188ecaffa3 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
index 38c61d64c8..38c61d64c8 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOM.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index cb9d538389..cb9d538389 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index d2625fba11..d2625fba11 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
index e041f85214..e041f85214 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleXmlNodeImpl.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
index ee9aa1bb76..ee9aa1bb76 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index 8a2b6b39aa..8a2b6b39aa 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
index 2ed548ad76..2ed548ad76 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
index 6257681091..6257681091 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAX2SAXAdapter.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index 52a1d02631..52a1d02631 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
index 103ecbd7d1..103ecbd7d1 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXHelper.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index f8967e35b6..f8967e35b6 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index 062e10cc45..062e10cc45 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index c56dba1843..c56dba1843 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
index c2de202a9b..c2de202a9b 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index a7364006d0..a7364006d0 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
index d73e495798..d73e495798 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/WrappingXMLStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 5ab7272d58..5ab7272d58 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
index cd33e64176..cd33e64176 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLDocumentStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
index a42d6acc9a..a42d6acc9a 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReader.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
index f1084cf2a3..f1084cf2a3 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLFragmentStreamReaderImpl.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index f7c895db1e..f7c895db1e 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index e2d0416aec..e2d0416aec 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 9b39f039b1..9b39f039b1 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index 6db731bc9f..6db731bc9f 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
index 920ebb511c..920ebb511c 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamSerializer.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
index f32f93d098..f32f93d098 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamable.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index 36cf5e9c9b..36cf5e9c9b 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
index 86ebd627f7..86ebd627f7 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNode.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
index 3dd125463e..3dd125463e 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlNodeIterator.java
diff --git a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
index f4bc357c7d..f4bc357c7d 100644
--- a/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderImpl.java
diff --git a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 10e6082b34..10e6082b34 100644
--- a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 568e04f9de..568e04f9de 100644
--- a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 96115be404..96115be404 100644
--- a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index e02cd5c934..e02cd5c934 100644
--- a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 7d8642fb1e..7d8642fb1e 100644
--- a/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
index 8c710062ad..8c710062ad 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DOMHelperTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index f9e331fbf3..f9e331fbf3 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
index 562c22354c..562c22354c 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
index 243ac71201..243ac71201 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index 07ee0b0ca4..07ee0b0ca4 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
index db210683dd..db210683dd 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingRegistryImplTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index 7c882c0285..7c882c0285 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 053e4f2a59..053e4f2a59 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index 6cc8868397..6cc8868397 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
index 31c3fd4f00..31c3fd4f00 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/TransformerRegistryImplTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
index dd3d000798..dd3d000798 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
index bdc9690285..bdc9690285 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index 9e9dabcea7..9e9dabcea7 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index f3b37c86db..f3b37c86db 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 3a287a5bb7..3a287a5bb7 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index cc1f9375c8..cc1f9375c8 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 5ae0616577..5ae0616577 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
index 9ca490f2d8..9ca490f2d8 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/StAXHelperTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index ff6f8c1406..ff6f8c1406 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
index 0463e7d9f5..0463e7d9f5 100644
--- a/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/XmlTreeStreamReaderTestCase.java
diff --git a/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index 100890e10b..100890e10b 100644
--- a/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-1.x/branches/sca-android/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/branches/sca-android/modules/definitions-xml/LICENSE b/sca-java-1.x/branches/sca-android/modules/definitions-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/definitions-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/LICENSE
diff --git a/branches/sca-android/modules/definitions-xml/META-INF/README b/sca-java-1.x/branches/sca-android/modules/definitions-xml/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/definitions-xml/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/META-INF/README
diff --git a/branches/sca-android/modules/definitions-xml/NOTICE b/sca-java-1.x/branches/sca-android/modules/definitions-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/definitions-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/NOTICE
diff --git a/branches/sca-android/modules/definitions-xml/pom.xml b/sca-java-1.x/branches/sca-android/modules/definitions-xml/pom.xml
index 75db3b51b0..75db3b51b0 100644
--- a/branches/sca-android/modules/definitions-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/pom.xml
diff --git a/branches/sca-android/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
index 0b760ef712..0b760ef712 100644
--- a/branches/sca-android/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
diff --git a/branches/sca-android/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
index b87d890866..b87d890866 100644
--- a/branches/sca-android/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
diff --git a/branches/sca-android/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 38fe3c5225..38fe3c5225 100644
--- a/branches/sca-android/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 4392461df1..4392461df1 100644
--- a/branches/sca-android/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-android/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
index 857887ec3f..857887ec3f 100644
--- a/branches/sca-android/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/main/resources/definitions-xml-validation-messages.properties
diff --git a/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
index 187b7fa9f8..187b7fa9f8 100644
--- a/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/Policy.java
diff --git a/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
index ec4ead8b87..ec4ead8b87 100644
--- a/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
diff --git a/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
index b4d7a8c584..b4d7a8c584 100644
--- a/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/TestPolicyProcessor.java
diff --git a/branches/sca-android/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
index f60047e769..f60047e769 100644
--- a/branches/sca-android/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-android/modules/definitions-xml/src/test/resources/org/apache/tuscany/sca/definitions/test_definitions.xml
diff --git a/branches/sca-android/modules/definitions/LICENSE b/sca-java-1.x/branches/sca-android/modules/definitions/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/definitions/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/LICENSE
diff --git a/branches/sca-android/modules/definitions/META-INF/README b/sca-java-1.x/branches/sca-android/modules/definitions/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/definitions/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/META-INF/README
diff --git a/branches/sca-android/modules/definitions/NOTICE b/sca-java-1.x/branches/sca-android/modules/definitions/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/definitions/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/NOTICE
diff --git a/branches/sca-android/modules/definitions/pom.xml b/sca-java-1.x/branches/sca-android/modules/definitions/pom.xml
index 8e6d0cfebb..8e6d0cfebb 100644
--- a/branches/sca-android/modules/definitions/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/pom.xml
diff --git a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
index 2039b9ecc9..2039b9ecc9 100644
--- a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
diff --git a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
index a41d7a6717..a41d7a6717 100644
--- a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
diff --git a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
index 85b9ad7f7d..85b9ad7f7d 100644
--- a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
diff --git a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
index 8b9ff3e1a9..8b9ff3e1a9 100644
--- a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
diff --git a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
index a5178497a0..a5178497a0 100644
--- a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
diff --git a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
index 8de6f63c05..8de6f63c05 100644
--- a/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
diff --git a/branches/sca-android/modules/endpoint/LICENSE b/sca-java-1.x/branches/sca-android/modules/endpoint/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/endpoint/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/LICENSE
diff --git a/branches/sca-android/modules/endpoint/META-INF/README b/sca-java-1.x/branches/sca-android/modules/endpoint/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/endpoint/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/META-INF/README
diff --git a/branches/sca-android/modules/endpoint/NOTICE b/sca-java-1.x/branches/sca-android/modules/endpoint/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/endpoint/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/NOTICE
diff --git a/branches/sca-android/modules/endpoint/pom.xml b/sca-java-1.x/branches/sca-android/modules/endpoint/pom.xml
index 31e8adc800..31e8adc800 100644
--- a/branches/sca-android/modules/endpoint/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/pom.xml
diff --git a/branches/sca-android/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
index f0646e934e..f0646e934e 100644
--- a/branches/sca-android/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverFactoryImpl.java
diff --git a/branches/sca-android/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
index b76c4b82f0..b76c4b82f0 100644
--- a/branches/sca-android/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointResolverImpl.java
diff --git a/branches/sca-android/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/branches/sca-android/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index 50e0a930d2..50e0a930d2 100644
--- a/branches/sca-android/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/branches/sca-android/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-1.x/branches/sca-android/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index 8bac9e01c9..8bac9e01c9 100644
--- a/branches/sca-android/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/AddService.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
index 5a2d9babf4..5a2d9babf4 100644
--- a/branches/sca-android/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/java/org/apace/tuscany/sca/binding/sca/EndpointTestCase.java
diff --git a/branches/sca-android/modules/endpoint/src/test/resources/Calculator.composite b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/resources/Calculator.composite
index 3b743f6e26..3b743f6e26 100644
--- a/branches/sca-android/modules/endpoint/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/endpoint/src/test/resources/Calculator.composite
diff --git a/branches/sca-android/modules/extensibility/LICENSE b/sca-java-1.x/branches/sca-android/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/extensibility/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/LICENSE
diff --git a/branches/sca-android/modules/extensibility/META-INF/README b/sca-java-1.x/branches/sca-android/modules/extensibility/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/extensibility/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/META-INF/README
diff --git a/branches/sca-android/modules/extensibility/NOTICE b/sca-java-1.x/branches/sca-android/modules/extensibility/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-android/modules/extensibility/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/NOTICE
diff --git a/branches/sca-android/modules/extensibility/pom.xml b/sca-java-1.x/branches/sca-android/modules/extensibility/pom.xml
index 01cd2d0ca9..01cd2d0ca9 100644
--- a/branches/sca-android/modules/extensibility/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/pom.xml
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 48f240559c..48f240559c 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
index 8ca030c0dd..8ca030c0dd 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
index 6f7c83c8d9..6f7c83c8d9 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index f2f67b2d52..f2f67b2d52 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index dbfd0dcd90..dbfd0dcd90 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
index ec0f12b8ba..ec0f12b8ba 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
index 6b14b95666..6b14b95666 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
index 2e11234095..2e11234095 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index 403b6aa7a7..403b6aa7a7 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
index 1722cd5f49..1722cd5f49 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
diff --git a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index ce41a44068..ce41a44068 100644
--- a/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/branches/sca-android/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
index 42bad63132..42bad63132 100644
--- a/branches/sca-android/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
diff --git a/branches/sca-android/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
index d769bad283..d769bad283 100644
--- a/branches/sca-android/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
diff --git a/branches/sca-android/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java b/sca-java-1.x/branches/sca-android/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
index fd508402fc..fd508402fc 100644
--- a/branches/sca-android/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
diff --git a/branches/sca-android/modules/host-embedded/LICENSE b/sca-java-1.x/branches/sca-android/modules/host-embedded/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/host-embedded/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/LICENSE
diff --git a/branches/sca-android/modules/host-embedded/META-INF/README b/sca-java-1.x/branches/sca-android/modules/host-embedded/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/host-embedded/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/META-INF/README
diff --git a/branches/sca-android/modules/host-embedded/NOTICE b/sca-java-1.x/branches/sca-android/modules/host-embedded/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/host-embedded/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/NOTICE
diff --git a/branches/sca-android/modules/host-embedded/pom.xml b/sca-java-1.x/branches/sca-android/modules/host-embedded/pom.xml
index 92fd8cc016..92fd8cc016 100644
--- a/branches/sca-android/modules/host-embedded/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/pom.xml
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
index a7f148cdda..a7f148cdda 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomain.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
index c9bfe499c6..c9bfe499c6 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCADomainBean.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
index 7c893a5c9e..7c893a5c9e 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/SCATestCaseRunner.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
index 187f32f405..187f32f405 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ComponentManagerImpl.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
index 1bca290c27..1bca290c27 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomain.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
index 519e76d0ae..519e76d0ae 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomain.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
index d59f1544e5..d59f1544e5 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/HotUpdatableSCADomain.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
index 55b6afb6f2..55b6afb6f2 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntime.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
index 738e5e6248..738e5e6248 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
index 5f38c0c063..5f38c0c063 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentListener.java
diff --git a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
index 4acb270810..4acb270810 100644
--- a/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/management/ComponentManager.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
index 9252b114a1..9252b114a1 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainBeanTestCase.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
index c52c16d8e1..c52c16d8e1 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/SCADomainTestCase.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
index fd5398c8e6..fd5398c8e6 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/DefaultSCADomainTestCase.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
index 2a59635a19..2a59635a19 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/EmbeddedSCADomainTestCase.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
index 1cfe5ed5d8..1cfe5ed5d8 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/impl/TestModelResolver.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
index 86e0cb6a8a..86e0cb6a8a 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/DefaultTestImplementationFactory.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
index d9f1228307..d9f1228307 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementation.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
index 9200d850bb..9200d850bb 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestImplementationFactory.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
index 4adec91151..4adec91151 100644
--- a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/TestService.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
index 083b01167f..083b01167f 100644
--- a/branches/sca-android/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/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationImpl.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
index 73feffad50..73feffad50 100644
--- a/branches/sca-android/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/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/impl/TestImplementationProcessor.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
index f6f077e99b..f6f077e99b 100644
--- a/branches/sca-android/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/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/module/TestModuleActivator.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
index 1d27e08fee..1d27e08fee 100644
--- a/branches/sca-android/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/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProvider.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
index 15d3618fdd..15d3618fdd 100644
--- a/branches/sca-android/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/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestImplementationProviderFactory.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
index d49179dec0..d49179dec0 100644
--- a/branches/sca-android/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/modules/host-embedded/src/test/java/org/apache/tuscany/sca/host/embedded/test/extension/provider/TestInvoker.java
diff --git a/branches/sca-android/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 7e2e11e4cc..7e2e11e4cc 100644
--- a/branches/sca-android/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android/modules/host-embedded/src/test/resources/test.composite b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/resources/test.composite
index bd7c5fab79..bd7c5fab79 100644
--- a/branches/sca-android/modules/host-embedded/src/test/resources/test.composite
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/resources/test.composite
diff --git a/branches/sca-android/modules/host-embedded/src/test/resources/test.txt b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/resources/test.txt
index 287f9b1f65..287f9b1f65 100644
--- a/branches/sca-android/modules/host-embedded/src/test/resources/test.txt
+++ b/sca-java-1.x/branches/sca-android/modules/host-embedded/src/test/resources/test.txt
diff --git a/branches/sca-android/modules/implementation-java-runtime/LICENSE b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-android/modules/implementation-java-runtime/META-INF/README b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/implementation-java-runtime/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/META-INF/README
diff --git a/branches/sca-android/modules/implementation-java-runtime/NOTICE b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-android/modules/implementation-java-runtime/pom.xml b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/pom.xml
index 96510ea576..96510ea576 100644
--- a/branches/sca-android/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index ac8af3ed64..ac8af3ed64 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index a93710d266..a93710d266 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index b5d3254fa0..b5d3254fa0 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 5285caa481..5285caa481 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 2513c63e38..2513c63e38 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index d8eef18c74..d8eef18c74 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
index ffce7ce467..ffce7ce467 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ConversationIDObjectFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index dd454be7c5..dd454be7c5 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index 4a8c8f31b8..4a8c8f31b8 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index 4d062859b9..4d062859b9 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 5aeebcca36..5aeebcca36 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 695dea3343..695dea3343 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 9f587f58de..9f587f58de 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index baf9eb9cc1..baf9eb9cc1 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index ca9c08fe63..ca9c08fe63 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index 17450f43cb..17450f43cb 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 5d4d999453..5d4d999453 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 25c09231c5..25c09231c5 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index e6ebb5abc3..e6ebb5abc3 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 135fde09ff..135fde09ff 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index ef4e67d79a..ef4e67d79a 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index 2903cc6fc8..2903cc6fc8 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index e585b3d46f..e585b3d46f 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index 4a5ad98e5b..4a5ad98e5b 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 25d538cff4..25d538cff4 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index e9eea607c9..e9eea607c9 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index 9b78439012..9b78439012 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 95a9f63688..95a9f63688 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
index ee3507ef80..ee3507ef80 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaPolicyHandlingRuntimeWireProcessor.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index 515a7c8a43..515a7c8a43 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index a7b175cf9b..a7b175cf9b 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
index 8c85b46c65..8c85b46c65 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/PolicyHandlingInterceptor.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
index 111b008b96..111b008b96 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/module/JavaRuntimeModuleActivator.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 0871ddf4be..0871ddf4be 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index ba8da101c6..ba8da101c6 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
index 628a308c86..628a308c86 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
index 29dcfa8169..29dcfa8169 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index cc852cc677..cc852cc677 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
index d502462688..d502462688 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index 4de0a4e8c7..4de0a4e8c7 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index 214779ed3f..214779ed3f 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
index c470b8cf3d..c470b8cf3d 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
index ed7a0e7d03..ed7a0e7d03 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index c1650c3a83..c1650c3a83 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 40ad1b1e95..40ad1b1e95 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index de371e09bb..de371e09bb 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index 1fb7abb917..1fb7abb917 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index e993cdd382..e993cdd382 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index 82264c77c9..82264c77c9 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a5e12d181c..a5e12d181c 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index ed6bf7ddc4..ed6bf7ddc4 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-android/modules/implementation-java-xml/LICENSE b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/implementation-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/LICENSE
diff --git a/branches/sca-android/modules/implementation-java-xml/META-INF/README b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/implementation-java-xml/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/META-INF/README
diff --git a/branches/sca-android/modules/implementation-java-xml/NOTICE b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/implementation-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/NOTICE
diff --git a/branches/sca-android/modules/implementation-java-xml/pom.xml b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/pom.xml
index d89d7fd406..d89d7fd406 100644
--- a/branches/sca-android/modules/implementation-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/pom.xml
diff --git a/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index ecbf0c4c78..ecbf0c4c78 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index 11934ec6bb..11934ec6bb 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ff43eebcfc..ff43eebcfc 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
index 210b715da8..210b715da8 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddService.java
index 9c22177684..9c22177684 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddService.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
index 3f28d740a7..3f28d740a7 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
index c1fceb575d..c1fceb575d 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
index 9599c86292..9599c86292 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
index e1f35f99b5..e1f35f99b5 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
index 7a3d06c15e..7a3d06c15e 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
index d621407908..d621407908 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
index 21af91f392..21af91f392 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
index 4fed0a8c6a..4fed0a8c6a 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index e5912906f5..e5912906f5 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index 27e3579c35..27e3579c35 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index 646b5db617..646b5db617 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index a58fa0c072..a58fa0c072 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index cddc134c2c..cddc134c2c 100644
--- a/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-android/modules/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/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 9147133d5d..9147133d5d 100644
--- a/branches/sca-android/modules/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/modules/implementation-java-xml/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/branches/sca-android/modules/implementation-java/LICENSE b/sca-java-1.x/branches/sca-android/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/implementation-java/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/LICENSE
diff --git a/branches/sca-android/modules/implementation-java/META-INF/README b/sca-java-1.x/branches/sca-android/modules/implementation-java/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/implementation-java/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/META-INF/README
diff --git a/branches/sca-android/modules/implementation-java/NOTICE b/sca-java-1.x/branches/sca-android/modules/implementation-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/implementation-java/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/NOTICE
diff --git a/branches/sca-android/modules/implementation-java/pom.xml b/sca-java-1.x/branches/sca-android/modules/implementation-java/pom.xml
index 19adeeaf46..19adeeaf46 100644
--- a/branches/sca-android/modules/implementation-java/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/pom.xml
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index e44ebd7c91..e44ebd7c91 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 2ad7edbd6f..2ad7edbd6f 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 97773879fa..97773879fa 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 0bcec3c78f..0bcec3c78f 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
index c0b04b4b4e..c0b04b4b4e 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaConstructorImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
index 2365298f71..2365298f71 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaElementImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
index 46594e0f50..46594e0f50 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationActivator.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index 0cc78498e6..0cc78498e6 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 375896cf26..375896cf26 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
index c4c528f4f2..c4c528f4f2 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaParameterImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
index 1aca15ebb8..1aca15ebb8 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaResourceImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
index 85c2f73f75..85c2f73f75 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaScopeImpl.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 4fa40dee4b..4fa40dee4b 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 9596fe0808..9596fe0808 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 4a3ce0c343..4a3ce0c343 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index c6e6b6e4d6..c6e6b6e4d6 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
index bc6551d45d..bc6551d45d 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/BaseJavaClassVisitor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 556f0b77e9..556f0b77e9 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 17e28479d3..17e28479d3 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 177ceaa57c..177ceaa57c 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
index 985f8baa82..985f8baa82 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
index efd04262dd..efd04262dd 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 50e4d46e97..50e4d46e97 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index 88a245cbf3..88a245cbf3 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 9b834e7e87..9b834e7e87 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 4325faef26..4325faef26 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index b9e1923e73..b9e1923e73 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 300ad6817e..300ad6817e 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 2d177b3f76..2d177b3f76 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 5619275b82..5619275b82 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index b7f6748ed2..b7f6748ed2 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index 9fe2fcd468..9fe2fcd468 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index f5696122df..f5696122df 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 6a0d60c92f..6a0d60c92f 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 8f50852c2d..8f50852c2d 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 54f7dfad1e..54f7dfad1e 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 25196c56e5..25196c56e5 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index ccfbaf0043..ccfbaf0043 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e130f4221d..e130f4221d 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 583ccc86cd..583ccc86cd 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index 91b97b2caf..91b97b2caf 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
index a1e1d01ab3..a1e1d01ab3 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementation.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 976b4da120..976b4da120 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index e77a6beb0d..e77a6beb0d 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index debb5cbacc..debb5cbacc 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
index 7147da55b4..7147da55b4 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceType.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
index 6039bd91f8..6039bd91f8 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaIntrospectionHelper.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 453cfa35fe..453cfa35fe 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 954a3abbc8..954a3abbc8 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index cf1b4a9830..cf1b4a9830 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index a1f8a766ae..a1f8a766ae 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index 3d43e39ce8..3d43e39ce8 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index e15f9a0d6a..e15f9a0d6a 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index a3d3889d30..a3d3889d30 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 6854acdc2a..6854acdc2a 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index e1ca3ea565..e1ca3ea565 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index 57d224b2bf..57d224b2bf 100644
--- a/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index df60d57cf9..df60d57cf9 100644
--- a/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index dc9de12632..dc9de12632 100644
--- a/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index fe93424d28..fe93424d28 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
index 5beb31f0f9..5beb31f0f9 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index e5abb07760..e5abb07760 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index fa1527fbe5..fa1527fbe5 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 690869ccb8..690869ccb8 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index 8c10df2146..8c10df2146 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index 365fb12afe..365fb12afe 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index f77c9abad9..f77c9abad9 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
index c6b2626e9c..c6b2626e9c 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationIDProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
index 4555736813..4555736813 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
index aa2671071c..aa2671071c 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConvertTimeMillisTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index ffc67325fa..ffc67325fa 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 09bcc7ab6c..09bcc7ab6c 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index c7f340bd46..c7f340bd46 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index e98a8fec1f..e98a8fec1f 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index ff267cd938..ff267cd938 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index ed0527d3d7..ed0527d3d7 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index 70c615ca24..70c615ca24 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
index 388a1aae8b..388a1aae8b 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/JavaClassIntrospectorImplTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 4a625982b0..4a625982b0 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 8d5e816a08..8d5e816a08 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index d68b1530f0..d68b1530f0 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index 7bb8e15696..7bb8e15696 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index d7de4e522e..d7de4e522e 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 10f0500e4d..10f0500e4d 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index aea90aa6eb..aea90aa6eb 100644
--- a/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/LICENSE b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/implementation-node-runtime/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/LICENSE
diff --git a/branches/sca-android/modules/implementation-node-runtime/META-INF/README b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/implementation-node-runtime/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/META-INF/README
diff --git a/branches/sca-android/modules/implementation-node-runtime/NOTICE b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-android/modules/implementation-node-runtime/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/NOTICE
diff --git a/branches/sca-android/modules/implementation-node-runtime/pom.xml b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/pom.xml
index bc4f0ae7bf..bc4f0ae7bf 100644
--- a/branches/sca-android/modules/implementation-node-runtime/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/pom.xml
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
index 8de2a3a3f9..8de2a3a3f9 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
index 0264574fb9..0264574fb9 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
index 62a822a85e..62a822a85e 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherUtil.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
index 5895a8614d..5895a8614d 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationInvoker.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
index 6cdb18938e..6cdb18938e 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProvider.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
index e2a3e4df92..e2a3e4df92 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/provider/NodeImplementationProviderFactory.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
index f6a601a3cd..f6a601a3cd 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppRequestDispatcher.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
index 5a50f87d4c..5a50f87d4c 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 306b53be5b..306b53be5b 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
index 73475f49fe..73475f49fe 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/NodeImplementationTestCase.java
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/test/resources/TestComposite.composite b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/test/resources/TestComposite.composite
diff --git a/branches/sca-android/modules/implementation-node-runtime/src/test/resources/TestNode.composite b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/test/resources/TestNode.composite
index d4dc62a42d..d4dc62a42d 100644
--- a/branches/sca-android/modules/implementation-node-runtime/src/test/resources/TestNode.composite
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node-runtime/src/test/resources/TestNode.composite
diff --git a/branches/sca-android/modules/implementation-node/LICENSE b/sca-java-1.x/branches/sca-android/modules/implementation-node/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/implementation-node/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/LICENSE
diff --git a/branches/sca-android/modules/implementation-node/META-INF/README b/sca-java-1.x/branches/sca-android/modules/implementation-node/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/implementation-node/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/META-INF/README
diff --git a/branches/sca-android/modules/implementation-node/NOTICE b/sca-java-1.x/branches/sca-android/modules/implementation-node/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/implementation-node/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/NOTICE
diff --git a/branches/sca-android/modules/implementation-node/pom.xml b/sca-java-1.x/branches/sca-android/modules/implementation-node/pom.xml
index 2027eb7e30..2027eb7e30 100644
--- a/branches/sca-android/modules/implementation-node/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/pom.xml
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
index d4755f4071..d4755f4071 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/ConfiguredNodeImplementation.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
index 527698ea91..527698ea91 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementation.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
index 9c4fed689b..9c4fed689b 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/NodeImplementationFactory.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
index 736afc13f0..736afc13f0 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/builder/impl/NodeCompositeBuilderImpl.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
index 1d183513b4..1d183513b4 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/ConfiguredNodeImplementationImpl.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
index 94ea610314..94ea610314 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationFactoryImpl.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
index 8f6315d969..8f6315d969 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/impl/NodeImplementationImpl.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
index e695340d45..e695340d45 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/ConfiguredNodeImplementationProcessor.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
index 201354f89c..201354f89c 100644
--- a/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/java/org/apache/tuscany/sca/implementation/node/xml/NodeImplementationProcessor.java
diff --git a/branches/sca-android/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9378db0875..9378db0875 100644
--- a/branches/sca-android/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
index b8a63a3b16..b8a63a3b16 100644
--- a/branches/sca-android/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.node.NodeImplementationFactory
diff --git a/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
index 1dc397659b..1dc397659b 100644
--- a/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
diff --git a/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
index bc0c3b1507..bc0c3b1507 100644
--- a/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/ReadTestCase.java
diff --git a/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
index c5e6a40f89..c5e6a40f89 100644
--- a/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/xml/WriteTestCase.java
diff --git a/branches/sca-android/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
index 55644c27e5..55644c27e5 100644
--- a/branches/sca-android/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestComposite.composite
diff --git a/branches/sca-android/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
index 92787d3ac1..92787d3ac1 100644
--- a/branches/sca-android/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
+++ b/sca-java-1.x/branches/sca-android/modules/implementation-node/src/test/resources/org/apache/tuscany/sca/implementation/node/xml/TestNode.composite
diff --git a/branches/sca-android/modules/interface-java-xml/LICENSE b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/interface-java-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/LICENSE
diff --git a/branches/sca-android/modules/interface-java-xml/META-INF/README b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/interface-java-xml/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/META-INF/README
diff --git a/branches/sca-android/modules/interface-java-xml/NOTICE b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/interface-java-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/NOTICE
diff --git a/branches/sca-android/modules/interface-java-xml/pom.xml b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/pom.xml
index 989e7bd6ae..989e7bd6ae 100644
--- a/branches/sca-android/modules/interface-java-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/pom.xml
diff --git a/branches/sca-android/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 5d2d8ed51c..5d2d8ed51c 100644
--- a/branches/sca-android/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/branches/sca-android/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index ae5bf4c56d..ae5bf4c56d 100644
--- a/branches/sca-android/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/branches/sca-android/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index b3e52e5709..b3e52e5709 100644
--- a/branches/sca-android/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
index bc0a7192b5..bc0a7192b5 100644
--- a/branches/sca-android/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/main/resources/interface-javaxml-validation-messages.properties
diff --git a/branches/sca-android/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index 313f950873..313f950873 100644
--- a/branches/sca-android/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/branches/sca-android/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index 55fc12d176..55fc12d176 100644
--- a/branches/sca-android/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index 3de6410596..3de6410596 100644
--- a/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
index dca38c9224..dca38c9224 100644
--- a/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index 23ebf576e5..23ebf576e5 100644
--- a/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/branches/sca-android/modules/interface-java/LICENSE b/sca-java-1.x/branches/sca-android/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/interface-java/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/LICENSE
diff --git a/branches/sca-android/modules/interface-java/META-INF/README b/sca-java-1.x/branches/sca-android/modules/interface-java/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/interface-java/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/META-INF/README
diff --git a/branches/sca-android/modules/interface-java/NOTICE b/sca-java-1.x/branches/sca-android/modules/interface-java/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/interface-java/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/NOTICE
diff --git a/branches/sca-android/modules/interface-java/pom.xml b/sca-java-1.x/branches/sca-android/modules/interface-java/pom.xml
index bab2576ea8..bab2576ea8 100644
--- a/branches/sca-android/modules/interface-java/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/pom.xml
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 7853b597d3..7853b597d3 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 9c09ef50c2..9c09ef50c2 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index e3a84c63f0..e3a84c63f0 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 9225926269..9225926269 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index e6cb35cc4b..e6cb35cc4b 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..d43ebe558b 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index b1efd6e197..b1efd6e197 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 42e45317b7..42e45317b7 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index b1198824fa..b1198824fa 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 2a9e3c5329..2a9e3c5329 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
index 4384213bf5..4384213bf5 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
index ed00510a67..ed00510a67 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
diff --git a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/branches/sca-android/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
index 5ba12ec137..5ba12ec137 100644
--- a/branches/sca-android/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
index 14b0577f65..14b0577f65 100644
--- a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
diff --git a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 66f98adce3..66f98adce3 100644
--- a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
index f90a5cb8a1..f90a5cb8a1 100644
--- a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/ConversationalIntrospectionTestCase.java
diff --git a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
index 14ac8b0134..14ac8b0134 100644
--- a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java
diff --git a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
index 5a454f176c..5a454f176c 100644
--- a/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-android/modules/interface/LICENSE b/sca-java-1.x/branches/sca-android/modules/interface/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/interface/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/interface/LICENSE
diff --git a/branches/sca-android/modules/interface/META-INF/README b/sca-java-1.x/branches/sca-android/modules/interface/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/interface/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/interface/META-INF/README
diff --git a/branches/sca-android/modules/interface/NOTICE b/sca-java-1.x/branches/sca-android/modules/interface/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/interface/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/interface/NOTICE
diff --git a/branches/sca-android/modules/interface/pom.xml b/sca-java-1.x/branches/sca-android/modules/interface/pom.xml
index 7c75e66767..7c75e66767 100644
--- a/branches/sca-android/modules/interface/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/interface/pom.xml
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index 247a432330..247a432330 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 1f5620c0b9..1f5620c0b9 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index 70f6d5b403..70f6d5b403 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index 179dc1755e..179dc1755e 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index f9de645a6e..f9de645a6e 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 568a6c595c..568a6c595c 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 5601b09660..5601b09660 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index 2a273c9a26..2a273c9a26 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 4676e35f80..4676e35f80 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 6773b29088..6773b29088 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index c1c8400b71..c1c8400b71 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index 15581b5e04..15581b5e04 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 9e7d6882f7..9e7d6882f7 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index e2a524c5e0..e2a524c5e0 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 00a5dc3065..00a5dc3065 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 777fa567f1..777fa567f1 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 844b0af509..844b0af509 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 54c0a3ec11..54c0a3ec11 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index 2598dc8545..2598dc8545 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 12db460959..12db460959 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index 26ecf6e352..26ecf6e352 100644
--- a/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-android/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper b/sca-java-1.x/branches/sca-android/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
index 821c58bde1..821c58bde1 100644
--- a/branches/sca-android/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
diff --git a/branches/sca-android/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index 269a3dc038..269a3dc038 100644
--- a/branches/sca-android/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/branches/sca-android/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-1.x/branches/sca-android/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index 338170da52..338170da52 100644
--- a/branches/sca-android/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/interface/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/branches/sca-android/modules/monitor/LICENSE b/sca-java-1.x/branches/sca-android/modules/monitor/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/monitor/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/LICENSE
diff --git a/branches/sca-android/modules/monitor/META-INF/README b/sca-java-1.x/branches/sca-android/modules/monitor/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/monitor/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/META-INF/README
diff --git a/branches/sca-android/modules/monitor/NOTICE b/sca-java-1.x/branches/sca-android/modules/monitor/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/monitor/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/NOTICE
diff --git a/branches/sca-android/modules/monitor/pom.xml b/sca-java-1.x/branches/sca-android/modules/monitor/pom.xml
index 44990c4c02..44990c4c02 100644
--- a/branches/sca-android/modules/monitor/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/pom.xml
diff --git a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
index c16140213d..c16140213d 100644
--- a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
diff --git a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
index 38c3bbd991..38c3bbd991 100644
--- a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
diff --git a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
index 83a2d63eae..83a2d63eae 100644
--- a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
diff --git a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
index 274b4faefd..274b4faefd 100644
--- a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorFactoryImpl.java
diff --git a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
index b98f29d4dd..b98f29d4dd 100644
--- a/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/DefaultMonitorImpl.java
diff --git a/branches/sca-android/modules/node-api/LICENSE b/sca-java-1.x/branches/sca-android/modules/node-api/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/node-api/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/LICENSE
diff --git a/branches/sca-android/modules/node-api/META-INF/README b/sca-java-1.x/branches/sca-android/modules/node-api/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/node-api/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/META-INF/README
diff --git a/branches/sca-android/modules/node-api/NOTICE b/sca-java-1.x/branches/sca-android/modules/node-api/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/node-api/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/NOTICE
diff --git a/branches/sca-android/modules/node-api/pom.xml b/sca-java-1.x/branches/sca-android/modules/node-api/pom.xml
index 02210daa88..02210daa88 100644
--- a/branches/sca-android/modules/node-api/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/pom.xml
diff --git a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
index f390e8881e..f390e8881e 100644
--- a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAClient.java
diff --git a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
index de7f352122..de7f352122 100644
--- a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCAContribution.java
diff --git a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
index fea749a57c..fea749a57c 100644
--- a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode.java
diff --git a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
index a1d4ddb2b1..a1d4ddb2b1 100644
--- a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2.java
diff --git a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
index 2b0dbc88eb..2b0dbc88eb 100644
--- a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANode2Factory.java
diff --git a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
index e41afd29c4..e41afd29c4 100644
--- a/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-api/src/main/java/org/apache/tuscany/sca/node/SCANodeFactory.java
diff --git a/branches/sca-android/modules/node-impl/LICENSE b/sca-java-1.x/branches/sca-android/modules/node-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/node-impl/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/LICENSE
diff --git a/branches/sca-android/modules/node-impl/META-INF/README b/sca-java-1.x/branches/sca-android/modules/node-impl/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/node-impl/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/META-INF/README
diff --git a/branches/sca-android/modules/node-impl/NOTICE b/sca-java-1.x/branches/sca-android/modules/node-impl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/node-impl/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/NOTICE
diff --git a/branches/sca-android/modules/node-impl/pom.xml b/sca-java-1.x/branches/sca-android/modules/node-impl/pom.xml
index f932c9abc4..f932c9abc4 100644
--- a/branches/sca-android/modules/node-impl/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/pom.xml
diff --git a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
index 419900c5ac..419900c5ac 100644
--- a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2FactoryImpl.java
diff --git a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
index bc2f10fb7e..bc2f10fb7e 100644
--- a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/Node2Impl.java
diff --git a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index 18b166acdd..18b166acdd 100644
--- a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index a8a076a602..a8a076a602 100644
--- a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
index 5b0e31fd03..5b0e31fd03 100644
--- a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
diff --git a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
index 6c93fa7800..6c93fa7800 100644
--- a/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBuilder.java
diff --git a/branches/sca-android/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
index 4215855ac9..4215855ac9 100644
--- a/branches/sca-android/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANode2Factory
diff --git a/branches/sca-android/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
index 800bdd84cc..800bdd84cc 100644
--- a/branches/sca-android/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.SCANodeFactory
diff --git a/branches/sca-android/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-android/modules/node-impl/src/test/java/hello/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-android/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
index c9a7560b12..c9a7560b12 100644
--- a/branches/sca-android/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-android/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
index 52d96dd72d..52d96dd72d 100644
--- a/branches/sca-android/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/Node2ImplTestCase.java
diff --git a/branches/sca-android/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
index d620f6b62a..d620f6b62a 100644
--- a/branches/sca-android/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
diff --git a/branches/sca-android/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/resources/HelloWorld.composite
index 9e3299d691..9e3299d691 100644
--- a/branches/sca-android/modules/node-impl/src/test/resources/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-android/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
index 1d37bcebe0..1d37bcebe0 100644
--- a/branches/sca-android/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/modules/node-launcher/LICENSE b/sca-java-1.x/branches/sca-android/modules/node-launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/node-launcher/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/LICENSE
diff --git a/branches/sca-android/modules/node-launcher/META-INF/README b/sca-java-1.x/branches/sca-android/modules/node-launcher/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/node-launcher/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/META-INF/README
diff --git a/branches/sca-android/modules/node-launcher/NOTICE b/sca-java-1.x/branches/sca-android/modules/node-launcher/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/node-launcher/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/NOTICE
diff --git a/branches/sca-android/modules/node-launcher/pom.xml b/sca-java-1.x/branches/sca-android/modules/node-launcher/pom.xml
index 606a4f9164..606a4f9164 100644
--- a/branches/sca-android/modules/node-launcher/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/pom.xml
diff --git a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
index 4f4f861e2f..4f4f861e2f 100644
--- a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index eb06ad7411..eb06ad7411 100644
--- a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index 7cfabfe265..7cfabfe265 100644
--- a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index be9bdb15c4..be9bdb15c4 100644
--- a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 7be1e14988..7be1e14988 100644
--- a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index eafe4ddaa0..eafe4ddaa0 100644
--- a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 5345363031..5345363031 100644
--- a/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-1.x/branches/sca-android/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
diff --git a/branches/sca-android/modules/policy-xml/LICENSE b/sca-java-1.x/branches/sca-android/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-android/modules/policy-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/LICENSE
diff --git a/branches/sca-android/modules/policy-xml/META-INF/README b/sca-java-1.x/branches/sca-android/modules/policy-xml/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/policy-xml/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/META-INF/README
diff --git a/branches/sca-android/modules/policy-xml/NOTICE b/sca-java-1.x/branches/sca-android/modules/policy-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-android/modules/policy-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/NOTICE
diff --git a/branches/sca-android/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-android/modules/policy-xml/pom.xml
index 178648c7a3..178648c7a3 100644
--- a/branches/sca-android/modules/policy-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/pom.xml
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index d47cbd7dbe..d47cbd7dbe 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index 119afa3473..119afa3473 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index ec357aea93..ec357aea93 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 3f1008e9a8..3f1008e9a8 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index 76ef8df298..76ef8df298 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 81ca27a085..81ca27a085 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index 7c205292b0..7c205292b0 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index abe80e2a54..abe80e2a54 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index 73795349c1..73795349c1 100644
--- a/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index c41a0cd01f..c41a0cd01f 100644
--- a/branches/sca-android/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
index 40107bb11e..40107bb11e 100644
--- a/branches/sca-android/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
diff --git a/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index c9fad18157..c9fad18157 100644
--- a/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
index ce5b204787..ce5b204787 100644
--- a/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/branches/sca-android/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index b51a6fba98..b51a6fba98 100644
--- a/branches/sca-android/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-android/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-android/modules/policy/LICENSE b/sca-java-1.x/branches/sca-android/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/policy/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/policy/LICENSE
diff --git a/branches/sca-android/modules/policy/META-INF/README b/sca-java-1.x/branches/sca-android/modules/policy/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/policy/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/policy/META-INF/README
diff --git a/branches/sca-android/modules/policy/NOTICE b/sca-java-1.x/branches/sca-android/modules/policy/NOTICE
index b3e4797aaa..b3e4797aaa 100644
--- a/branches/sca-android/modules/policy/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/policy/NOTICE
diff --git a/branches/sca-android/modules/policy/pom.xml b/sca-java-1.x/branches/sca-android/modules/policy/pom.xml
index 2c76db7f89..2c76db7f89 100644
--- a/branches/sca-android/modules/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/policy/pom.xml
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
index 6ca4fe72ec..6ca4fe72ec 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index 22f328f643..22f328f643 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index bf2cfca924..bf2cfca924 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
index 6db529c7f0..6db529c7f0 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
index ee67006875..ee67006875 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 1b225bc918..1b225bc918 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
index c6393e2ada..c6393e2ada 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
index 65c39803d2..65c39803d2 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index 49bcbae1ae..49bcbae1ae 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index b16072c214..b16072c214 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index f4156fc2e6..f4156fc2e6 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
index caa0d04fe3..caa0d04fe3 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
index 28ff9d09d3..28ff9d09d3 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
index 0f43221dd6..0f43221dd6 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index dbdef38324..dbdef38324 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index fa95d84c4e..fa95d84c4e 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
index aa6e27c240..aa6e27c240 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 2d6bd0eb6f..2d6bd0eb6f 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
index a0e2f10f56..a0e2f10f56 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 1db29b835e..1db29b835e 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 4bd9d5b7c7..4bd9d5b7c7 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
index 98a116fe7b..98a116fe7b 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
index e5002d2cdc..e5002d2cdc 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
index d6f65b1788..d6f65b1788 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
index 2e4c6a9d78..2e4c6a9d78 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
index 1f91710f95..1f91710f95 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
index 3a37ed3c41..3a37ed3c41 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
index c80e68a0be..c80e68a0be 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
index 6d6420017f..6d6420017f 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
index eb97818042..eb97818042 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
index afb3c035ae..afb3c035ae 100644
--- a/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/branches/sca-android/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-1.x/branches/sca-android/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
index a0e56c1822..a0e56c1822 100644
--- a/branches/sca-android/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
diff --git a/branches/sca-android/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-1.x/branches/sca-android/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 846b3b24a4..846b3b24a4 100644
--- a/branches/sca-android/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/branches/sca-android/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-android/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 636ff5ab45..636ff5ab45 100644
--- a/branches/sca-android/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-android/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/branches/sca-android/modules/pom.xml b/sca-java-1.x/branches/sca-android/modules/pom.xml
index fffe442b51..fffe442b51 100644
--- a/branches/sca-android/modules/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/pom.xml
diff --git a/branches/sca-android/modules/sca-api/LICENSE b/sca-java-1.x/branches/sca-android/modules/sca-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/modules/sca-api/LICENSE
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/LICENSE
diff --git a/branches/sca-android/modules/sca-api/META-INF/README b/sca-java-1.x/branches/sca-android/modules/sca-api/META-INF/README
index 009570154d..009570154d 100644
--- a/branches/sca-android/modules/sca-api/META-INF/README
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/META-INF/README
diff --git a/branches/sca-android/modules/sca-api/NOTICE b/sca-java-1.x/branches/sca-android/modules/sca-api/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/modules/sca-api/NOTICE
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/NOTICE
diff --git a/branches/sca-android/modules/sca-api/pom.xml b/sca-java-1.x/branches/sca-android/modules/sca-api/pom.xml
index 54e43ce91c..54e43ce91c 100644
--- a/branches/sca-android/modules/sca-api/pom.xml
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/pom.xml
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
index c32d229a76..c32d229a76 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/CallableReference.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
index 616d4c6338..616d4c6338 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ComponentContext.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/Constants.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
index b1b2af8048..b1b2af8048 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/Constants.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
index 64423a4aa2..64423a4aa2 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/Conversation.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
index 63e3907cff..63e3907cff 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ConversationEndedException.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
index 7c067a3a43..7c067a3a43 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/NoRegisteredCallbackException.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
index 900d5eecc1..900d5eecc1 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/RequestContext.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
index 8790aac4fb..8790aac4fb 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceReference.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
index 1c6b436afa..1c6b436afa 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceRuntimeException.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
index d3543799ed..d3543799ed 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/ServiceUnavailableException.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
index bab9713026..bab9713026 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/AllowsPassByReference.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
index 1d1ecdbc13..1d1ecdbc13 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
index a9fc36f769..a9fc36f769 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
index 477053670a..477053670a 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
index f54e421c81..f54e421c81 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
index 86d2d6560d..86d2d6560d 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
index 37f767c1f4..37f767c1f4 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
index 1484d4ac77..1484d4ac77 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
index 13ca9a2931..13ca9a2931 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
index f16bf44808..f16bf44808 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
index 7d3da46ea9..7d3da46ea9 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
index b9483bc9a8..b9483bc9a8 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
index 9e6942651b..9e6942651b 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
index 32654fea17..32654fea17 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
index 1a9288934c..1a9288934c 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
index 0769a94fbb..0769a94fbb 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
index fbc7398da4..fbc7398da4 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
index 57247cd8a3..57247cd8a3 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
index 864a69b19a..864a69b19a 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
index a0abe16068..a0abe16068 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
index 768429cd91..768429cd91 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
index 1021f6e37f..1021f6e37f 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
index aa439cabab..aa439cabab 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
index 6fded2dec8..6fded2dec8 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
diff --git a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
index 1e475cd4c8..1e475cd4c8 100644
--- a/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
+++ b/sca-java-1.x/branches/sca-android/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
diff --git a/branches/sca-android/pom.xml b/sca-java-1.x/branches/sca-android/pom.xml
index 8626814873..8626814873 100644
--- a/branches/sca-android/pom.xml
+++ b/sca-java-1.x/branches/sca-android/pom.xml
diff --git a/branches/sca-android/samples/README b/sca-java-1.x/branches/sca-android/samples/README
index 2646fbb73a..2646fbb73a 100644
--- a/branches/sca-android/samples/README
+++ b/sca-java-1.x/branches/sca-android/samples/README
diff --git a/branches/sca-android/samples/binding-echo-extension/README b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/README
index 94716b151f..94716b151f 100644
--- a/branches/sca-android/samples/binding-echo-extension/README
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/README
diff --git a/branches/sca-android/samples/binding-echo-extension/build.xml b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/build.xml
index 5df5981bea..5df5981bea 100644
--- a/branches/sca-android/samples/binding-echo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/build.xml
diff --git a/branches/sca-android/samples/binding-echo-extension/pom.xml b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/pom.xml
index 2d516f2101..2d516f2101 100644
--- a/branches/sca-android/samples/binding-echo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/pom.xml
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
index 3fe1598e0d..3fe1598e0d 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/EchoBinding.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
index 0f6fee82be..0f6fee82be 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/EchoBindingFactory.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
index af759dbf93..af759dbf93 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingFactoryImpl.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
index 19c9271bb8..19c9271bb8 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
index 45fdb73f67..45fdb73f67 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
index 91697fcd9a..91697fcd9a 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingInvoker.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
index 4877bade7f..4877bade7f 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingPoliciedInvoker.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
index ba74d8f99a..ba74d8f99a 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoBindingProviderFactory.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
index 0efc319af9..0efc319af9 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoReferenceBindingProvider.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
index 1cd1e5af4e..1cd1e5af4e 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/EchoServiceBindingProvider.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
index 33dc761aa4..33dc761aa4 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicy.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
index c847d088a6..c847d088a6 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingEncryptionPolicyProcessor.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
index 7d38e3b7a8..7d38e3b7a8 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicy.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
index 72b8002238..72b8002238 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EchoBindingPolicyProcessor.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
index deda8d9744..deda8d9744 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionPolicyHandler.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
index ffadfc7fff..ffadfc7fff 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/EncryptionStrategy.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
index 6fa5f26977..6fa5f26977 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/PolicyHandler.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
index cf55b36fc2..cf55b36fc2 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/ReverseEncryptionStrategy.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
index ac610cfb51..ac610cfb51 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicy.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
index fcb250b444..fcb250b444 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/provider/policy/WSPolicyProcessor.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
index 8ea2395d04..8ea2395d04 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/server/EchoServer.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
index 32336dd94f..32336dd94f 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/java/echo/server/EchoServiceListener.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
index 55be293862..55be293862 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/echo.EchoBindingFactory
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 06d53250c1..06d53250c1 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 4ad61f573d..4ad61f573d 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index efa475ef92..efa475ef92 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/branches/sca-android/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
index 9b64df4871..9b64df4871 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/main/resources/sample-binding-echo.xsd
diff --git a/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/Echo.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
index 7383077f18..7383077f18 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
index ab05516622..ab05516622 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java
diff --git a/branches/sca-android/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
index 176d67cc4b..176d67cc4b 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
diff --git a/branches/sca-android/samples/binding-echo-extension/src/test/resources/definitions.xml b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/resources/definitions.xml
index 1cb1d1c9ba..1cb1d1c9ba 100644
--- a/branches/sca-android/samples/binding-echo-extension/src/test/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo-extension/src/test/resources/definitions.xml
diff --git a/branches/sca-android/samples/binding-echo/README b/sca-java-1.x/branches/sca-android/samples/binding-echo/README
index 2772460cc6..2772460cc6 100644
--- a/branches/sca-android/samples/binding-echo/README
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/README
diff --git a/branches/sca-android/samples/binding-echo/binding-echo.png b/sca-java-1.x/branches/sca-android/samples/binding-echo/binding-echo.png
index a38d985363..a38d985363 100644
--- a/branches/sca-android/samples/binding-echo/binding-echo.png
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/binding-echo.png
diff --git a/branches/sca-android/samples/binding-echo/binding-echo.svg b/sca-java-1.x/branches/sca-android/samples/binding-echo/binding-echo.svg
index 5b5051bef5..5b5051bef5 100644
--- a/branches/sca-android/samples/binding-echo/binding-echo.svg
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/binding-echo.svg
diff --git a/branches/sca-android/samples/binding-echo/build.xml b/sca-java-1.x/branches/sca-android/samples/binding-echo/build.xml
index 7689ef3a54..7689ef3a54 100644
--- a/branches/sca-android/samples/binding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/build.xml
diff --git a/branches/sca-android/samples/binding-echo/pom.xml b/sca-java-1.x/branches/sca-android/samples/binding-echo/pom.xml
index 9c14b5d4c3..9c14b5d4c3 100644
--- a/branches/sca-android/samples/binding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/pom.xml
diff --git a/branches/sca-android/samples/binding-echo/src/main/java/echo/Echo.java b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/main/java/echo/Echo.java
index 1d5e973f33..1d5e973f33 100644
--- a/branches/sca-android/samples/binding-echo/src/main/java/echo/Echo.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/main/java/echo/Echo.java
diff --git a/branches/sca-android/samples/binding-echo/src/main/java/echo/EchoBindingClient.java b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
index 21bdff4011..21bdff4011 100644
--- a/branches/sca-android/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/main/java/echo/EchoBindingClient.java
diff --git a/branches/sca-android/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
index ba68dfe908..ba68dfe908 100644
--- a/branches/sca-android/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/main/java/echo/EchoComponentImpl.java
diff --git a/branches/sca-android/samples/binding-echo/src/main/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/main/resources/EchoBinding.composite
index 94612fb325..94612fb325 100644
--- a/branches/sca-android/samples/binding-echo/src/main/resources/EchoBinding.composite
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/main/resources/EchoBinding.composite
diff --git a/branches/sca-android/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
index 1a597fc80f..1a597fc80f 100644
--- a/branches/sca-android/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/binding-echo/src/test/java/echo/EchoBindingTestCase.java
diff --git a/branches/sca-android/samples/calculator-lean/README b/sca-java-1.x/branches/sca-android/samples/calculator-lean/README
index a8aff232c6..a8aff232c6 100644
--- a/branches/sca-android/samples/calculator-lean/README
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/README
diff --git a/branches/sca-android/samples/calculator-lean/calculator.png b/sca-java-1.x/branches/sca-android/samples/calculator-lean/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-android/samples/calculator-lean/calculator.png
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/calculator.png
diff --git a/branches/sca-android/samples/calculator-lean/calculator.svg b/sca-java-1.x/branches/sca-android/samples/calculator-lean/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-android/samples/calculator-lean/calculator.svg
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/calculator.svg
diff --git a/branches/sca-android/samples/calculator-lean/pom.xml b/sca-java-1.x/branches/sca-android/samples/calculator-lean/pom.xml
index 10f4ae110f..10f4ae110f 100644
--- a/branches/sca-android/samples/calculator-lean/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/pom.xml
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/AddService.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
index 2bb8f96dcf..2bb8f96dcf 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/samples/calculator-lean/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/resources/Calculator.composite
index 913081b9be..913081b9be 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/resources/Calculator.composite
diff --git a/branches/sca-android/samples/calculator-lean/src/main/resources/CalculatorTest.composite b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/resources/CalculatorTest.composite
index 906e2a3918..906e2a3918 100644
--- a/branches/sca-android/samples/calculator-lean/src/main/resources/CalculatorTest.composite
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/main/resources/CalculatorTest.composite
diff --git a/branches/sca-android/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
index a007a28f21..a007a28f21 100644
--- a/branches/sca-android/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator-lean/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-android/samples/calculator/README b/sca-java-1.x/branches/sca-android/samples/calculator/README
index ceb532faed..ceb532faed 100644
--- a/branches/sca-android/samples/calculator/README
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/README
diff --git a/branches/sca-android/samples/calculator/build.xml b/sca-java-1.x/branches/sca-android/samples/calculator/build.xml
index c4b755ef94..c4b755ef94 100644
--- a/branches/sca-android/samples/calculator/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/build.xml
diff --git a/branches/sca-android/samples/calculator/calculator.png b/sca-java-1.x/branches/sca-android/samples/calculator/calculator.png
index 995a57b1fd..995a57b1fd 100644
--- a/branches/sca-android/samples/calculator/calculator.png
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/calculator.png
diff --git a/branches/sca-android/samples/calculator/calculator.svg b/sca-java-1.x/branches/sca-android/samples/calculator/calculator.svg
index 0615925c50..0615925c50 100644
--- a/branches/sca-android/samples/calculator/calculator.svg
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/calculator.svg
diff --git a/branches/sca-android/samples/calculator/pom.xml b/sca-java-1.x/branches/sca-android/samples/calculator/pom.xml
index 4a2216c2e9..4a2216c2e9 100644
--- a/branches/sca-android/samples/calculator/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/pom.xml
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/AddService.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorClient.java
index 3b2966e96d..3b2966e96d 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-android/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-android/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-android/samples/calculator/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/branches/sca-android/samples/calculator/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/main/resources/Calculator.composite
diff --git a/branches/sca-android/samples/calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-1.x/branches/sca-android/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
index 1b7476534a..1b7476534a 100644
--- a/branches/sca-android/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/branches/sca-android/samples/databinding-echo/README b/sca-java-1.x/branches/sca-android/samples/databinding-echo/README
index 67c1aa32d5..67c1aa32d5 100644
--- a/branches/sca-android/samples/databinding-echo/README
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/README
diff --git a/branches/sca-android/samples/databinding-echo/build.xml b/sca-java-1.x/branches/sca-android/samples/databinding-echo/build.xml
index 7f2483f6fb..7f2483f6fb 100644
--- a/branches/sca-android/samples/databinding-echo/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/build.xml
diff --git a/branches/sca-android/samples/databinding-echo/databinding-echo.png b/sca-java-1.x/branches/sca-android/samples/databinding-echo/databinding-echo.png
index afbbfff285..afbbfff285 100644
--- a/branches/sca-android/samples/databinding-echo/databinding-echo.png
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/databinding-echo.png
diff --git a/branches/sca-android/samples/databinding-echo/databinding-echo.svg b/sca-java-1.x/branches/sca-android/samples/databinding-echo/databinding-echo.svg
index 87964abf86..87964abf86 100644
--- a/branches/sca-android/samples/databinding-echo/databinding-echo.svg
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/databinding-echo.svg
diff --git a/branches/sca-android/samples/databinding-echo/pom.xml b/sca-java-1.x/branches/sca-android/samples/databinding-echo/pom.xml
index 3ef0bcfbf5..3ef0bcfbf5 100644
--- a/branches/sca-android/samples/databinding-echo/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/pom.xml
diff --git a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
index 5679614164..5679614164 100644
--- a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/ComponentAImpl.java
diff --git a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
index ff8968837d..ff8968837d 100644
--- a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/ComponentBImpl.java
diff --git a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Echo.java b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Echo.java
index 25ecc90454..25ecc90454 100644
--- a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Echo.java
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Echo.java
diff --git a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
index 9ec3819899..9ec3819899 100644
--- a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/EchoDataBindingClient.java
diff --git a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Interface1.java b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Interface1.java
index 70b450e358..70b450e358 100644
--- a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Interface1.java
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Interface1.java
diff --git a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Interface2.java b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Interface2.java
index b62f1f425d..b62f1f425d 100644
--- a/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Interface2.java
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/java/dbecho/Interface2.java
diff --git a/branches/sca-android/samples/databinding-echo/src/main/resources/EchoDataBinding.composite b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
index 30b77a6152..30b77a6152 100644
--- a/branches/sca-android/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/resources/EchoDataBinding.composite
diff --git a/branches/sca-android/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
index ef2308aa73..ef2308aa73 100644
--- a/branches/sca-android/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/main/resources/wsdl/echo.wsdl
diff --git a/branches/sca-android/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
index 43434d8cee..43434d8cee 100644
--- a/branches/sca-android/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/databinding-echo/src/test/java/dbecho/EchoDataBindingTestCase.java
diff --git a/branches/sca-android/samples/implementation-composite/README b/sca-java-1.x/branches/sca-android/samples/implementation-composite/README
index 27de00e8ef..27de00e8ef 100644
--- a/branches/sca-android/samples/implementation-composite/README
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/README
diff --git a/branches/sca-android/samples/implementation-composite/build.xml b/sca-java-1.x/branches/sca-android/samples/implementation-composite/build.xml
index 7aa31aab8b..7aa31aab8b 100644
--- a/branches/sca-android/samples/implementation-composite/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/build.xml
diff --git a/branches/sca-android/samples/implementation-composite/implementation-composite.png b/sca-java-1.x/branches/sca-android/samples/implementation-composite/implementation-composite.png
index 4c6d71bc03..4c6d71bc03 100644
--- a/branches/sca-android/samples/implementation-composite/implementation-composite.png
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/implementation-composite.png
diff --git a/branches/sca-android/samples/implementation-composite/implementation-composite.svg b/sca-java-1.x/branches/sca-android/samples/implementation-composite/implementation-composite.svg
index 0e60354aab..0e60354aab 100644
--- a/branches/sca-android/samples/implementation-composite/implementation-composite.svg
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/implementation-composite.svg
diff --git a/branches/sca-android/samples/implementation-composite/pom.xml b/sca-java-1.x/branches/sca-android/samples/implementation-composite/pom.xml
index 229061acb1..229061acb1 100644
--- a/branches/sca-android/samples/implementation-composite/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/pom.xml
diff --git a/branches/sca-android/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/CompositeClient.java
index bf743e1797..bf743e1797 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/java/composite/CompositeClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/CompositeClient.java
diff --git a/branches/sca-android/samples/implementation-composite/src/main/java/composite/Source.java b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/Source.java
index d0efcc1df1..d0efcc1df1 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/java/composite/Source.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/Source.java
diff --git a/branches/sca-android/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/SourceCallback.java
index baa95a8e39..baa95a8e39 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/java/composite/SourceCallback.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/SourceCallback.java
diff --git a/branches/sca-android/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/SourceImpl.java
index b9a0c7ff74..b9a0c7ff74 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/java/composite/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/SourceImpl.java
diff --git a/branches/sca-android/samples/implementation-composite/src/main/java/composite/Target.java b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/Target.java
index 9a8f68a7fa..9a8f68a7fa 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/java/composite/Target.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/Target.java
diff --git a/branches/sca-android/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/TargetImpl.java
index 86686e9233..86686e9233 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/java/composite/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/java/composite/TargetImpl.java
diff --git a/branches/sca-android/samples/implementation-composite/src/main/resources/InnerComposite.composite b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/resources/InnerComposite.composite
index 3376ac8ff5..3376ac8ff5 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/resources/InnerComposite.composite
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/resources/InnerComposite.composite
diff --git a/branches/sca-android/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/resources/InnerComposite2.composite
index c9eff4fa9d..c9eff4fa9d 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/resources/InnerComposite2.composite
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/resources/InnerComposite2.composite
diff --git a/branches/sca-android/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
index e675fd3624..e675fd3624 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/branches/sca-android/samples/implementation-composite/src/main/resources/OuterComposite.composite b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/resources/OuterComposite.composite
index cb1c1e13d4..cb1c1e13d4 100644
--- a/branches/sca-android/samples/implementation-composite/src/main/resources/OuterComposite.composite
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/main/resources/OuterComposite.composite
diff --git a/branches/sca-android/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
index 9e9a4b44a4..9e9a4b44a4 100644
--- a/branches/sca-android/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/README b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/README
index 5e8190648f..5e8190648f 100644
--- a/branches/sca-android/samples/implementation-crud-extension/README
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/README
diff --git a/branches/sca-android/samples/implementation-crud-extension/build.xml b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/build.xml
index 88d308e6fc..88d308e6fc 100644
--- a/branches/sca-android/samples/implementation-crud-extension/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/build.xml
diff --git a/branches/sca-android/samples/implementation-crud-extension/pom.xml b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/pom.xml
index c11953f0ac..c11953f0ac 100644
--- a/branches/sca-android/samples/implementation-crud-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/pom.xml
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUD.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
index b23d85887b..b23d85887b 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUD.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
index 49be844f93..49be844f93 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementation.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
index fa83c63c1b..fa83c63c1b 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/CRUDImplementationFactory.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
index cc0795a735..cc0795a735 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/backend/ResourceManager.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
index 2f1e5fcba8..2f1e5fcba8 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationFactoryImpl.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
index 383a035e69..383a035e69 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/impl/CRUDImplementationImpl.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
index b212ee3c9b..b212ee3c9b 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationInvoker.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
index 8f11f9d910..8f11f9d910 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProvider.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
index 4566cb7155..4566cb7155 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/java/crud/provider/CRUDImplementationProviderFactory.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
index 3cf5de5fa1..3cf5de5fa1 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/crud.CRUDImplementationFactory
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 17c98cf706..17c98cf706 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 527c626418..527c626418 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 6ce605197a..6ce605197a 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
index 447e31bf93..447e31bf93 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/main/resources/sample-implementation-crud.xsd
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
index 0bb5cfc361..0bb5cfc361 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/test/java/crud/CRUDTestCase.java
diff --git a/branches/sca-android/samples/implementation-crud-extension/src/test/resources/crud.composite b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/test/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-android/samples/implementation-crud-extension/src/test/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud-extension/src/test/resources/crud.composite
diff --git a/branches/sca-android/samples/implementation-crud/README b/sca-java-1.x/branches/sca-android/samples/implementation-crud/README
index 50da631c04..50da631c04 100644
--- a/branches/sca-android/samples/implementation-crud/README
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud/README
diff --git a/branches/sca-android/samples/implementation-crud/build.xml b/sca-java-1.x/branches/sca-android/samples/implementation-crud/build.xml
index 10b26b5a94..10b26b5a94 100644
--- a/branches/sca-android/samples/implementation-crud/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud/build.xml
diff --git a/branches/sca-android/samples/implementation-crud/implementation-crud.png b/sca-java-1.x/branches/sca-android/samples/implementation-crud/implementation-crud.png
index a292037e7a..a292037e7a 100644
--- a/branches/sca-android/samples/implementation-crud/implementation-crud.png
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud/implementation-crud.png
diff --git a/branches/sca-android/samples/implementation-crud/implementation-crud.svg b/sca-java-1.x/branches/sca-android/samples/implementation-crud/implementation-crud.svg
index dbb37be208..dbb37be208 100644
--- a/branches/sca-android/samples/implementation-crud/implementation-crud.svg
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud/implementation-crud.svg
diff --git a/branches/sca-android/samples/implementation-crud/pom.xml b/sca-java-1.x/branches/sca-android/samples/implementation-crud/pom.xml
index 3cc75a6f7d..3cc75a6f7d 100644
--- a/branches/sca-android/samples/implementation-crud/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud/pom.xml
diff --git a/branches/sca-android/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
index ea87cb3001..ea87cb3001 100644
--- a/branches/sca-android/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud/src/main/java/crud/client/CRUDClient.java
diff --git a/branches/sca-android/samples/implementation-crud/src/main/resources/crud.composite b/sca-java-1.x/branches/sca-android/samples/implementation-crud/src/main/resources/crud.composite
index 18745033bb..18745033bb 100644
--- a/branches/sca-android/samples/implementation-crud/src/main/resources/crud.composite
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud/src/main/resources/crud.composite
diff --git a/branches/sca-android/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java b/sca-java-1.x/branches/sca-android/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
index 7e0476a8b1..7e0476a8b1 100644
--- a/branches/sca-android/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-crud/src/test/java/crud/client/CRUDTestCase.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/README b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/README
index 3b201779e1..3b201779e1 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/README
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/README
diff --git a/branches/sca-android/samples/implementation-pojo-extension/build.xml b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/build.xml
index 78bae79859..78bae79859 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/build.xml
diff --git a/branches/sca-android/samples/implementation-pojo-extension/pom.xml b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/pom.xml
index d7bb120e93..d7bb120e93 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/pom.xml
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
index 7c2f5d236f..7c2f5d236f 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementation.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
index bbcfb3d0dc..bbcfb3d0dc 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/POJOImplementationFactory.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
index 0dad270a6c..0dad270a6c 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationFactoryImpl.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
index f2d6871039..f2d6871039 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationImpl.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
index 44a2cc0aa8..44a2cc0aa8 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
index 87333c61f6..87333c61f6 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationInvoker.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
index 73a0d22493..73a0d22493 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProvider.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
index 22f2be09e9..22f2be09e9 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/java/pojo/provider/POJOImplementationProviderFactory.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 8337e81c5f..8337e81c5f 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 64dd230a15..64dd230a15 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index b30ea3b9cf..b30ea3b9cf 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
index 075af98240..075af98240 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/META-INF/services/pojo.POJOImplementationFactory
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
index c9d170770b..c9d170770b 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/main/resources/sample-implementation-pojo.xsd
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
index cc32929f09..cc32929f09 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorld.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
index 0580e30aba..0580e30aba 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
index 69ab1f567e..69ab1f567e 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldImpl2.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
index d8b5f41adc..d8b5f41adc 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
index a92c5ab8db..a92c5ab8db 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/resources/helloworld/HelloWorldImpl2.componentType
diff --git a/branches/sca-android/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
index c38094dfc9..c38094dfc9 100644
--- a/branches/sca-android/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-1.x/branches/sca-android/samples/implementation-pojo-extension/src/test/resources/helloworld/helloworld.composite
diff --git a/branches/sca-android/samples/pom.xml b/sca-java-1.x/branches/sca-android/samples/pom.xml
index e7af01dbac..e7af01dbac 100644
--- a/branches/sca-android/samples/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/pom.xml
diff --git a/branches/sca-android/samples/simple-bigbank/README b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/README
index acbe93a4d3..acbe93a4d3 100644
--- a/branches/sca-android/samples/simple-bigbank/README
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/README
diff --git a/branches/sca-android/samples/simple-bigbank/build.xml b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/build.xml
index a814014eae..a814014eae 100644
--- a/branches/sca-android/samples/simple-bigbank/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/build.xml
diff --git a/branches/sca-android/samples/simple-bigbank/pom.xml b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/pom.xml
index bb99d5cd6c..bb99d5cd6c 100644
--- a/branches/sca-android/samples/simple-bigbank/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/pom.xml
diff --git a/branches/sca-android/samples/simple-bigbank/simple-bigbank.png b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/simple-bigbank.png
index 593c047f6a..593c047f6a 100644
--- a/branches/sca-android/samples/simple-bigbank/simple-bigbank.png
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/simple-bigbank.png
diff --git a/branches/sca-android/samples/simple-bigbank/simple-bigbank.svg b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/simple-bigbank.svg
index c64f6de6b9..c64f6de6b9 100644
--- a/branches/sca-android/samples/simple-bigbank/simple-bigbank.svg
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/simple-bigbank.svg
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
index 1625ff5b65..1625ff5b65 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountReport.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
index 7c9082b944..7c9082b944 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountService.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
index fa85f309c0..fa85f309c0 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/account/AccountServiceImpl.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
index a5ae7b3955..a5ae7b3955 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/Account.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
index c354de387b..c354de387b 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataService.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
index 000acb935c..000acb935c 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/AccountDataServiceImpl.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
index 11bdff757e..11bdff757e 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/CheckingAccount.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
index b791024076..b791024076 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/SavingsAccount.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
index 86246a3f84..86246a3f84 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/accountdata/StockAccount.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
index edbf910d37..edbf910d37 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/client/BigBankClient.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index 0512d40b0b..0512d40b0b 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
index 7961279352..7961279352 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/resources/Account.composite b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/resources/Account.composite
index e71615e27e..e71615e27e 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/resources/Account.composite
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/resources/Account.composite
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/resources/BigBank.composite b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/resources/BigBank.composite
index c870f39cab..c870f39cab 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/resources/BigBank.composite
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/resources/BigBank.composite
diff --git a/branches/sca-android/samples/simple-bigbank/src/main/resources/StockQuote.composite b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/resources/StockQuote.composite
index 4f29c14851..4f29c14851 100644
--- a/branches/sca-android/samples/simple-bigbank/src/main/resources/StockQuote.composite
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/main/resources/StockQuote.composite
diff --git a/branches/sca-android/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
index ba6c1dd797..ba6c1dd797 100644
--- a/branches/sca-android/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
diff --git a/branches/sca-android/samples/simple-callback/README b/sca-java-1.x/branches/sca-android/samples/simple-callback/README
index 719376f254..719376f254 100644
--- a/branches/sca-android/samples/simple-callback/README
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/README
diff --git a/branches/sca-android/samples/simple-callback/build.xml b/sca-java-1.x/branches/sca-android/samples/simple-callback/build.xml
index 47d1ea4bc1..47d1ea4bc1 100644
--- a/branches/sca-android/samples/simple-callback/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/build.xml
diff --git a/branches/sca-android/samples/simple-callback/pom.xml b/sca-java-1.x/branches/sca-android/samples/simple-callback/pom.xml
index 3a449dade9..3a449dade9 100644
--- a/branches/sca-android/samples/simple-callback/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/pom.xml
diff --git a/branches/sca-android/samples/simple-callback/simple-callback.png b/sca-java-1.x/branches/sca-android/samples/simple-callback/simple-callback.png
index 1b6353f5cf..1b6353f5cf 100644
--- a/branches/sca-android/samples/simple-callback/simple-callback.png
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/simple-callback.png
diff --git a/branches/sca-android/samples/simple-callback/simple-callback.svg b/sca-java-1.x/branches/sca-android/samples/simple-callback/simple-callback.svg
index 484b65df9d..484b65df9d 100644
--- a/branches/sca-android/samples/simple-callback/simple-callback.svg
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/simple-callback.svg
diff --git a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyClient.java b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyClient.java
index 4cc00d6d0f..4cc00d6d0f 100644
--- a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyClient.java
diff --git a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
index 3e2a1df5a5..3e2a1df5a5 100644
--- a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyClientImpl.java
diff --git a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyService.java b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyService.java
index e78ad6f68f..e78ad6f68f 100644
--- a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyService.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyService.java
diff --git a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
index b27eea44f5..b27eea44f5 100644
--- a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyServiceCallback.java
diff --git a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
index fc5e31d14e..fc5e31d14e 100644
--- a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/MyServiceImpl.java
diff --git a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
index b8987fcd07..b8987fcd07 100644
--- a/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
diff --git a/branches/sca-android/samples/simple-callback/src/main/resources/simplecallback.composite b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/resources/simplecallback.composite
index 33e6f60601..33e6f60601 100644
--- a/branches/sca-android/samples/simple-callback/src/main/resources/simplecallback.composite
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/main/resources/simplecallback.composite
diff --git a/branches/sca-android/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
index cbaab8af83..cbaab8af83 100644
--- a/branches/sca-android/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
diff --git a/branches/sca-android/samples/supplychain/README b/sca-java-1.x/branches/sca-android/samples/supplychain/README
index ea4493fdd4..ea4493fdd4 100644
--- a/branches/sca-android/samples/supplychain/README
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/README
diff --git a/branches/sca-android/samples/supplychain/build.xml b/sca-java-1.x/branches/sca-android/samples/supplychain/build.xml
index 506180b8b1..506180b8b1 100644
--- a/branches/sca-android/samples/supplychain/build.xml
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/build.xml
diff --git a/branches/sca-android/samples/supplychain/pom.xml b/sca-java-1.x/branches/sca-android/samples/supplychain/pom.xml
index 0b5a76be4c..0b5a76be4c 100644
--- a/branches/sca-android/samples/supplychain/pom.xml
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/pom.xml
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/Customer.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/Customer.java
index 8088001898..8088001898 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/Customer.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/Customer.java
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
index 7a1e8553ec..7a1e8553ec 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/CustomerComponentImpl.java
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/Retailer.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/Retailer.java
index 1add63fb4e..1add63fb4e 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/Retailer.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/Retailer.java
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
index f622052cf8..f622052cf8 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/RetailerComponentImpl.java
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/Shipper.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/Shipper.java
index d4d49a922b..d4d49a922b 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/Shipper.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/Shipper.java
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
index 4ae52a12a2..4ae52a12a2 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/ShipperComponentImpl.java
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
index 7072f582d1..7072f582d1 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/SupplyChainClient.java
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/Warehouse.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/Warehouse.java
index 0be499f569..0be499f569 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/Warehouse.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/Warehouse.java
diff --git a/branches/sca-android/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
index b5e256a1e0..b5e256a1e0 100644
--- a/branches/sca-android/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/java/supplychain/WarehouseComponentImpl.java
diff --git a/branches/sca-android/samples/supplychain/src/main/resources/supplychain.composite b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/resources/supplychain.composite
index 301efcaf1f..301efcaf1f 100644
--- a/branches/sca-android/samples/supplychain/src/main/resources/supplychain.composite
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/main/resources/supplychain.composite
diff --git a/branches/sca-android/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java b/sca-java-1.x/branches/sca-android/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
index 88e0eb7ab8..88e0eb7ab8 100644
--- a/branches/sca-android/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
diff --git a/branches/sca-android/samples/supplychain/supplychain.png b/sca-java-1.x/branches/sca-android/samples/supplychain/supplychain.png
index 51a384e827..51a384e827 100644
--- a/branches/sca-android/samples/supplychain/supplychain.png
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/supplychain.png
diff --git a/branches/sca-android/samples/supplychain/supplychain.svg b/sca-java-1.x/branches/sca-android/samples/supplychain/supplychain.svg
index f72e77acab..f72e77acab 100644
--- a/branches/sca-android/samples/supplychain/supplychain.svg
+++ b/sca-java-1.x/branches/sca-android/samples/supplychain/supplychain.svg
diff --git a/branches/sca-android/tools/eclipse34/features/core/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/features/core/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/features/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/META-INF/MANIFEST.MF
index 63215d7c6f..63215d7c6f 100644
--- a/branches/sca-android/tools/eclipse34/features/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/features/core/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/eclipse34/features/core/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/features/core/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-android/tools/eclipse34/features/core/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/build.properties
diff --git a/branches/sca-android/tools/eclipse34/features/core/feature.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/feature.xml
index 1a20ac1eb1..1a20ac1eb1 100644
--- a/branches/sca-android/tools/eclipse34/features/core/feature.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/feature.xml
diff --git a/branches/sca-android/tools/eclipse34/features/core/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/pom.xml
index 953eb9ec77..953eb9ec77 100644
--- a/branches/sca-android/tools/eclipse34/features/core/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/core/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/features/ejava/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/features/ejava/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
index f363ae7b2a..f363ae7b2a 100644
--- a/branches/sca-android/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/features/ejava/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/eclipse34/features/ejava/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/features/ejava/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-android/tools/eclipse34/features/ejava/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/build.properties
diff --git a/branches/sca-android/tools/eclipse34/features/ejava/feature.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/feature.xml
index ef2ab6c2ba..ef2ab6c2ba 100644
--- a/branches/sca-android/tools/eclipse34/features/ejava/feature.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/feature.xml
diff --git a/branches/sca-android/tools/eclipse34/features/ejava/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/pom.xml
index da67d110b7..da67d110b7 100644
--- a/branches/sca-android/tools/eclipse34/features/ejava/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/ejava/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/features/manager/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/features/manager/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/features/manager/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
index 8d8f5b271d..8d8f5b271d 100644
--- a/branches/sca-android/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/features/manager/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/eclipse34/features/manager/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/features/manager/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-android/tools/eclipse34/features/manager/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/build.properties
diff --git a/branches/sca-android/tools/eclipse34/features/manager/feature.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/feature.xml
index 189342993d..189342993d 100644
--- a/branches/sca-android/tools/eclipse34/features/manager/feature.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/feature.xml
diff --git a/branches/sca-android/tools/eclipse34/features/manager/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/pom.xml
index 2e4f221ef1..2e4f221ef1 100644
--- a/branches/sca-android/tools/eclipse34/features/manager/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/manager/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/features/process/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/features/process/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/features/process/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/META-INF/MANIFEST.MF
index 7f10d43405..7f10d43405 100644
--- a/branches/sca-android/tools/eclipse34/features/process/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/features/process/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/eclipse34/features/process/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/features/process/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-android/tools/eclipse34/features/process/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/build.properties
diff --git a/branches/sca-android/tools/eclipse34/features/process/feature.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/feature.xml
index 08332be61e..08332be61e 100644
--- a/branches/sca-android/tools/eclipse34/features/process/feature.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/feature.xml
diff --git a/branches/sca-android/tools/eclipse34/features/process/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/pom.xml
index 9ad398109a..9ad398109a 100644
--- a/branches/sca-android/tools/eclipse34/features/process/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/process/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/features/web20/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/features/web20/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/features/web20/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
index 2dc129ebaa..2dc129ebaa 100644
--- a/branches/sca-android/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/features/web20/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/eclipse34/features/web20/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/features/web20/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-android/tools/eclipse34/features/web20/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/build.properties
diff --git a/branches/sca-android/tools/eclipse34/features/web20/feature.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/feature.xml
index 8fe97d24a3..8fe97d24a3 100644
--- a/branches/sca-android/tools/eclipse34/features/web20/feature.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/feature.xml
diff --git a/branches/sca-android/tools/eclipse34/features/web20/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/pom.xml
index 9d4b4d50b5..9d4b4d50b5 100644
--- a/branches/sca-android/tools/eclipse34/features/web20/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/web20/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/features/webservice/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/features/webservice/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
index 9fb9f1282b..9fb9f1282b 100644
--- a/branches/sca-android/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/features/webservice/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/eclipse34/features/webservice/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/features/webservice/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/branches/sca-android/tools/eclipse34/features/webservice/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/build.properties
diff --git a/branches/sca-android/tools/eclipse34/features/webservice/feature.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/feature.xml
index d905b6475c..d905b6475c 100644
--- a/branches/sca-android/tools/eclipse34/features/webservice/feature.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/feature.xml
diff --git a/branches/sca-android/tools/eclipse34/features/webservice/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/pom.xml
index f42fa8ce48..f42fa8ce48 100644
--- a/branches/sca-android/tools/eclipse34/features/webservice/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/features/webservice/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
index 0d8b1053bf..0d8b1053bf 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/build.properties
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
index 6b6d79d45b..6b6d79d45b 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/icons/t.gif b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/icons/t.gif
index ba896ced08..ba896ced08 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/icons/t.gif
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/icons/t.gif
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/icons/tuscany.gif b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/icons/tuscany.gif
index 849dd76d4a..849dd76d4a 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/icons/tuscany.gif
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/icons/tuscany.gif
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
index ee9a3d2de9..ee9a3d2de9 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
index 7ea8d700f7..7ea8d700f7 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
index 70e794d2ce..70e794d2ce 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
index 7891cc31a6..7891cc31a6 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
index 883c7c0781..883c7c0781 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
index f90483a00d..f90483a00d 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
index 4830268272..4830268272 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
index 18850d9333..18850d9333 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
index 909290859a..909290859a 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
index 060f6ff6cb..060f6ff6cb 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
index edbe4b3e69..edbe4b3e69 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
index 056deb5b27..056deb5b27 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
index 5f8ea73db4..5f8ea73db4 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
index f66fa71191..f66fa71191 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
index 6eba5ffdc2..6eba5ffdc2 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
index 2a4c7206db..2a4c7206db 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
index 5fc1a75960..5fc1a75960 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
index 702da9701e..702da9701e 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
index a1c6cb86a7..a1c6cb86a7 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
index 5e059308e6..5e059308e6 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
index 5d9f2bdf70..5d9f2bdf70 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/plugin.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/plugin.xml
index edc17c5ee2..edc17c5ee2 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/plugin.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/plugin.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/pom.xml
index b32ec079d4..b32ec079d4 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/src/main/assembly/jar.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
index 7832ba5131..7832ba5131 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-all.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-all.xsd
index 1b19ede427..1b19ede427 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-all.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-all.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
index c7f92f6c3b..c7f92f6c3b 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-core.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-core.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-core.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-policy.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/sca.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
diff --git a/branches/sca-android/tools/eclipse34/plugins/ejava/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/plugins/ejava/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
index fb238f04b1..fb238f04b1 100644
--- a/branches/sca-android/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/plugins/ejava/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-android/tools/eclipse34/plugins/ejava/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/plugins/ejava/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-android/tools/eclipse34/plugins/ejava/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/build.properties
diff --git a/branches/sca-android/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
index 4051436888..4051436888 100644
--- a/branches/sca-android/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
index 9b7c199c79..9b7c199c79 100644
--- a/branches/sca-android/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/ejava/plugin.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/plugin.xml
index fef1afe0b9..fef1afe0b9 100644
--- a/branches/sca-android/tools/eclipse34/plugins/ejava/plugin.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/plugin.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/ejava/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/pom.xml
index 752d20f7c1..752d20f7c1 100644
--- a/branches/sca-android/tools/eclipse34/plugins/ejava/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/ejava/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/manager/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/plugins/manager/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
index 2a70682fae..2a70682fae 100644
--- a/branches/sca-android/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/plugins/manager/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-android/tools/eclipse34/plugins/manager/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/plugins/manager/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-android/tools/eclipse34/plugins/manager/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/build.properties
diff --git a/branches/sca-android/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
index 4ec1688b56..4ec1688b56 100644
--- a/branches/sca-android/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
index 9c7df0f488..9c7df0f488 100644
--- a/branches/sca-android/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/manager/plugin.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/plugin.xml
index 2e09146dfd..2e09146dfd 100644
--- a/branches/sca-android/tools/eclipse34/plugins/manager/plugin.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/plugin.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/manager/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/pom.xml
index ae6b3516a2..ae6b3516a2 100644
--- a/branches/sca-android/tools/eclipse34/plugins/manager/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/manager/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/process/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/plugins/process/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
index 0acd32e51c..0acd32e51c 100644
--- a/branches/sca-android/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/plugins/process/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-android/tools/eclipse34/plugins/process/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/plugins/process/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-android/tools/eclipse34/plugins/process/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/build.properties
diff --git a/branches/sca-android/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
index a342de7bde..a342de7bde 100644
--- a/branches/sca-android/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
index dab0eeaadc..dab0eeaadc 100644
--- a/branches/sca-android/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/process/plugin.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/plugin.xml
index 3e5f87f634..3e5f87f634 100644
--- a/branches/sca-android/tools/eclipse34/plugins/process/plugin.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/plugin.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/process/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/pom.xml
index 5e7366c07b..5e7366c07b 100644
--- a/branches/sca-android/tools/eclipse34/plugins/process/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/process/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/web20/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/plugins/web20/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
index 3c2816ec4b..3c2816ec4b 100644
--- a/branches/sca-android/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/plugins/web20/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-android/tools/eclipse34/plugins/web20/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/plugins/web20/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-android/tools/eclipse34/plugins/web20/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/build.properties
diff --git a/branches/sca-android/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
index 3ccaa053bf..3ccaa053bf 100644
--- a/branches/sca-android/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
index 96026db08e..96026db08e 100644
--- a/branches/sca-android/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/web20/plugin.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/plugin.xml
index 6bf9087474..6bf9087474 100644
--- a/branches/sca-android/tools/eclipse34/plugins/web20/plugin.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/plugin.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/web20/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/pom.xml
index 7c450e753e..7c450e753e 100644
--- a/branches/sca-android/tools/eclipse34/plugins/web20/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/web20/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/webservice/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/plugins/webservice/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
index 9d83fd9b6b..9d83fd9b6b 100644
--- a/branches/sca-android/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
diff --git a/branches/sca-android/tools/eclipse34/plugins/webservice/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/branches/sca-android/tools/eclipse34/plugins/webservice/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/plugins/webservice/build.properties b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/branches/sca-android/tools/eclipse34/plugins/webservice/build.properties
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/build.properties
diff --git a/branches/sca-android/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
index 36ff7bb8df..36ff7bb8df 100644
--- a/branches/sca-android/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
index 6310209c3a..6310209c3a 100644
--- a/branches/sca-android/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
diff --git a/branches/sca-android/tools/eclipse34/plugins/webservice/plugin.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/plugin.xml
index 1fd46d3e75..1fd46d3e75 100644
--- a/branches/sca-android/tools/eclipse34/plugins/webservice/plugin.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/plugin.xml
diff --git a/branches/sca-android/tools/eclipse34/plugins/webservice/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/pom.xml
index 64fb36a15d..64fb36a15d 100644
--- a/branches/sca-android/tools/eclipse34/plugins/webservice/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/plugins/webservice/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/pom.xml
index a8da59b478..a8da59b478 100644
--- a/branches/sca-android/tools/eclipse34/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/site/updatesite/LICENSE b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/eclipse34/site/updatesite/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/LICENSE
diff --git a/branches/sca-android/tools/eclipse34/site/updatesite/NOTICE b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/eclipse34/site/updatesite/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/NOTICE
diff --git a/branches/sca-android/tools/eclipse34/site/updatesite/etc/generate-p2.sh b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/etc/generate-p2.sh
index ea2eb865f4..ea2eb865f4 100755
--- a/branches/sca-android/tools/eclipse34/site/updatesite/etc/generate-p2.sh
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/etc/generate-p2.sh
diff --git a/branches/sca-android/tools/eclipse34/site/updatesite/pom.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/pom.xml
index 0ef2f84873..0ef2f84873 100644
--- a/branches/sca-android/tools/eclipse34/site/updatesite/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/pom.xml
diff --git a/branches/sca-android/tools/eclipse34/site/updatesite/site.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/site.xml
index 1ea30f7f70..1ea30f7f70 100644
--- a/branches/sca-android/tools/eclipse34/site/updatesite/site.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/site.xml
diff --git a/branches/sca-android/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
index c1225e320b..c1225e320b 100644
--- a/branches/sca-android/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-1.x/branches/sca-android/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/branches/sca-android/tools/maven/maven-ant-generator/LICENSE b/sca-java-1.x/branches/sca-android/tools/maven/maven-ant-generator/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/maven/maven-ant-generator/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/maven/maven-ant-generator/LICENSE
diff --git a/branches/sca-android/tools/maven/maven-ant-generator/NOTICE b/sca-java-1.x/branches/sca-android/tools/maven/maven-ant-generator/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/maven/maven-ant-generator/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/maven/maven-ant-generator/NOTICE
diff --git a/branches/sca-android/tools/maven/maven-ant-generator/pom.xml b/sca-java-1.x/branches/sca-android/tools/maven/maven-ant-generator/pom.xml
index 42b379cdba..42b379cdba 100644
--- a/branches/sca-android/tools/maven/maven-ant-generator/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/maven/maven-ant-generator/pom.xml
diff --git a/branches/sca-android/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/sca-java-1.x/branches/sca-android/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
index d7b80bd67c..d7b80bd67c 100644
--- a/branches/sca-android/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
+++ b/sca-java-1.x/branches/sca-android/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
diff --git a/branches/sca-android/tools/maven/maven-incremental-build/LICENSE b/sca-java-1.x/branches/sca-android/tools/maven/maven-incremental-build/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-android/tools/maven/maven-incremental-build/LICENSE
+++ b/sca-java-1.x/branches/sca-android/tools/maven/maven-incremental-build/LICENSE
diff --git a/branches/sca-android/tools/maven/maven-incremental-build/NOTICE b/sca-java-1.x/branches/sca-android/tools/maven/maven-incremental-build/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-android/tools/maven/maven-incremental-build/NOTICE
+++ b/sca-java-1.x/branches/sca-android/tools/maven/maven-incremental-build/NOTICE
diff --git a/branches/sca-android/tools/maven/maven-incremental-build/pom.xml b/sca-java-1.x/branches/sca-android/tools/maven/maven-incremental-build/pom.xml
index e73c99b29d..e73c99b29d 100644
--- a/branches/sca-android/tools/maven/maven-incremental-build/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/maven/maven-incremental-build/pom.xml
diff --git a/branches/sca-android/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java b/sca-java-1.x/branches/sca-android/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
index 3a6870732b..3a6870732b 100644
--- a/branches/sca-android/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
+++ b/sca-java-1.x/branches/sca-android/tools/maven/maven-incremental-build/src/main/java/org/apache/tuscany/sca/tools/incremental/build/plugin/IncrementalBuildMojo.java
diff --git a/branches/sca-android/tools/maven/pom.xml b/sca-java-1.x/branches/sca-android/tools/maven/pom.xml
index 0d0ee8b61b..0d0ee8b61b 100644
--- a/branches/sca-android/tools/maven/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/maven/pom.xml
diff --git a/branches/sca-android/tools/pom.xml b/sca-java-1.x/branches/sca-android/tools/pom.xml
index 0a6b907fc2..0a6b907fc2 100644
--- a/branches/sca-android/tools/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tools/pom.xml
diff --git a/branches/sca-android/tutorials/pom.xml b/sca-java-1.x/branches/sca-android/tutorials/pom.xml
index 3f2d6359a8..3f2d6359a8 100644
--- a/branches/sca-android/tutorials/pom.xml
+++ b/sca-java-1.x/branches/sca-android/tutorials/pom.xml
diff --git a/branches/sca-android/vtest/assembly/component/pom.xml b/sca-java-1.x/branches/sca-android/vtest/assembly/component/pom.xml
index cf38e7ab8e..cf38e7ab8e 100644
--- a/branches/sca-android/vtest/assembly/component/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/pom.xml
diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
index 592020c180..592020c180 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/AService.java
diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
index 0d95c8e4b8..0d95c8e4b8 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/BService.java
diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
index c979c57f31..c979c57f31 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/CService.java
diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
index 8c0d08d052..8c0d08d052 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
index 424e245fea..424e245fea 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
index b2b420ed6a..b2b420ed6a 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/component.composite b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/component.composite
index bb452feac9..bb452feac9 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/resources/component.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/component.composite
diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/nonuniquename.composite b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/nonuniquename.composite
index 3019542091..3019542091 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/resources/nonuniquename.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/nonuniquename.composite
diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/serviceelement.composite b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/serviceelement.composite
index 9460f5a2e1..9460f5a2e1 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/resources/serviceelement.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/serviceelement.composite
diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithbinding.composite b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithbinding.composite
index 085d84f40e..085d84f40e 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithbinding.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithbinding.composite
diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithinterface.composite b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithinterface.composite
index cc915fbde5..cc915fbde5 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithinterface.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/servicewithinterface.composite
diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/zerocomponents.composite b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/zerocomponents.composite
index 6f02d7e941..6f02d7e941 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/resources/zerocomponents.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/zerocomponents.composite
diff --git a/branches/sca-android/vtest/assembly/component/src/main/resources/zeroimplelements.composite b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/zeroimplelements.composite
index 8629f3817a..8629f3817a 100644
--- a/branches/sca-android/vtest/assembly/component/src/main/resources/zeroimplelements.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/main/resources/zeroimplelements.composite
diff --git a/branches/sca-android/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
index de4fbe39ce..de4fbe39ce 100644
--- a/branches/sca-android/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentTestCase.java
diff --git a/branches/sca-android/vtest/assembly/ctypefile/pom.xml b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/pom.xml
index f1e2b3ba80..f1e2b3ba80 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/pom.xml
diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
index d1df390ace..d1df390ace 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/AService.java
diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
index 8ee18b242f..8ee18b242f 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/BService.java
diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
index 0f24201970..0f24201970 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
index fd32cb1f9b..fd32cb1f9b 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
index 173203ae21..173203ae21 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/AServiceImpl.componentType
diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
index c6a0f274c4..c6a0f274c4 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/typefile.composite
index 889bb846ba..889bb846ba 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/typefile.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/main/resources/typefile.composite
diff --git a/branches/sca-android/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
index f8f7e45f61..f8f7e45f61 100644
--- a/branches/sca-android/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
diff --git a/branches/sca-android/vtest/assembly/pom.xml b/sca-java-1.x/branches/sca-android/vtest/assembly/pom.xml
index 9a907402bf..9a907402bf 100644
--- a/branches/sca-android/vtest/assembly/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/assembly/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/pom.xml
index 2b612731fd..2b612731fd 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
index bc7212f70c..bc7212f70c 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
index 76c857126a..76c857126a 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B1Service.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
index b67d89d3e2..b67d89d3e2 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/B2Service.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
index 55d87c9546..55d87c9546 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
index 457b18e60a..457b18e60a 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B1ServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
index d6252f0a0c..d6252f0a0c 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/impl/B2ServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
index 4c2de35d52..4c2de35d52 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/main/resources/conversation.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
index c00d5f1c10..c00d5f1c10 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversational/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversational/ConversationAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/pom.xml
index 9531468e8f..9531468e8f 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
index a3f1f11826..a3f1f11826 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
index 8a1ed23b9d..8a1ed23b9d 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/B2Service.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
index 1d215100f7..1d215100f7 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/BService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
index cd4f29ea5b..cd4f29ea5b 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/CService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
index 64b99c9f98..64b99c9f98 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
index 0d34b802e1..0d34b802e1 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/B2ServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
index 762c9533d0..762c9533d0 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
index 3ebf63ba54..3ebf63ba54 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
index 3820240ee2..3820240ee2 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/ACallbackHandler.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
index 75573b838d..75573b838d 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/JaasLoginModule.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
index 8349e775c5..8349e775c5 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/security/UserPrincipal.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
index 9d5aec8ed5..9d5aec8ed5 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/AJass.config
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
index 49391b3353..49391b3353 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/conversation.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
index d3573176a3..d3573176a3 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/definitions.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
index c10369c9bd..c10369c9bd 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/main/resources/singleprincipal.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
index b9d10732e7..b9d10732e7 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/ConversationAttributesAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
index 4ebd667a00..4ebd667a00 100644
--- a/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/conversationattributes/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/conversationattributes/SinglePricipalTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/pom.xml
index 57477d1bbb..57477d1bbb 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
index 039689805c..039689805c 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
index 0b30bb8644..0b30bb8644 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr1Impl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
index 33b2e01bcb..33b2e01bcb 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr2Impl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
index d5630e859e..d5630e859e 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr3Impl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
index b8f384704a..b8f384704a 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceErr4Impl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
index 75a00447f3..75a00447f3 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
index b03a0defe5..b03a0defe5 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err1/AServiceErr1.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
index 93aafdd971..93aafdd971 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err2/AServiceErr2.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
index eb8f6e59ca..eb8f6e59ca 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err3/AServiceErr3.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
index 296a386876..296a386876 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/err4/AServiceErr4.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
index 4373bc2558..4373bc2558 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/main/resources/proper/AService.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
index f3b2f28200..f3b2f28200 100644
--- a/branches/sca-android/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/endsconversation/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/pom.xml
index 8cd14ed0a5..8cd14ed0a5 100644
--- a/branches/sca-android/vtest/java-api/annotations/endsconversation/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
index 13bcb1fd51..13bcb1fd51 100644
--- a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
index 5400c1fe0d..5400c1fe0d 100644
--- a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/BService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
index ed564ddbdc..ed564ddbdc 100644
--- a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
index 418fb93c68..418fb93c68 100644
--- a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
index cbc13e380c..cbc13e380c 100644
--- a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/main/resources/endsconversation.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
index 1ddd711a31..1ddd711a31 100644
--- a/branches/sca-android/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/endsconversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/endsconversation/EndsConversationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/init/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/pom.xml
index b2393947f8..b2393947f8 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
index edf13010f5..edf13010f5 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
index 5d53510462..5d53510462 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr1Impl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
index 43c1a8cffa..43c1a8cffa 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr2Impl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
index f5cac472c0..f5cac472c0 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr3Impl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
index b7c17ee535..b7c17ee535 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceErr4Impl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
index c2adea1426..c2adea1426 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
index 01b8e101e0..01b8e101e0 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err1/AServiceErr1.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
index 4ae38d44b6..4ae38d44b6 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err2/AServiceErr2.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
index 6bc3d8e7fc..6bc3d8e7fc 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err3/AServiceErr3.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
index 7ade16e6d3..7ade16e6d3 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/err4/AServiceErr4.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
index 35f13a2ae6..35f13a2ae6 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/main/resources/proper/AService.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
index 0dbccd8611..0dbccd8611 100644
--- a/branches/sca-android/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/oneway/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/pom.xml
index 18d22a913b..18d22a913b 100644
--- a/branches/sca-android/vtest/java-api/annotations/oneway/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
index 6fef2afa2a..6fef2afa2a 100644
--- a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
index 1cb4f3adf5..1cb4f3adf5 100644
--- a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/BService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
index 4829ffb95f..4829ffb95f 100644
--- a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
index 09c783ae96..09c783ae96 100644
--- a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
index 47a7a98c7d..47a7a98c7d 100644
--- a/branches/sca-android/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/main/resources/oneway.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
index f2fb8d0dc8..f2fb8d0dc8 100644
--- a/branches/sca-android/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/oneway/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/oneway/OneWayAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/pom.xml
index 2755583358..2755583358 100644
--- a/branches/sca-android/vtest/java-api/annotations/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/property/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/pom.xml
index 3d4781846a..3d4781846a 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
index 5cfea1b099..5cfea1b099 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
index 5ddc59f8b6..5ddc59f8b6 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/AnotherAService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
index 99fb842a9a..99fb842a9a 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/BService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
index 5de3b5fcff..5de3b5fcff 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/CService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
index f30c4c69fc..f30c4c69fc 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AObject.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
index b385083533..b385083533 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
index fd1ba5ee52..fd1ba5ee52 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/AnotherAServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
index f22f4a35b7..f22f4a35b7 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
index 280d2275f8..280d2275f8 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl1.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
index 6bc4384e73..6bc4384e73 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl2.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
index 6715b64fad..6715b64fad 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl3.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
index e10f07b0be..e10f07b0be 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl4.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
index 9a23e2de8d..9a23e2de8d 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl5.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
index b4797595ac..b4797595ac 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/impl/CServiceImpl6.java
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/main/resources/property.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/resources/property.composite
index f7af170f33..f7af170f33 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/main/resources/property.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/main/resources/property.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
index d5fbc568f7..d5fbc568f7 100644
--- a/branches/sca-android/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/property/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/property/PropertyAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/reference/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/pom.xml
index 261abb3ab9..261abb3ab9 100644
--- a/branches/sca-android/vtest/java-api/annotations/reference/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
index b28704a3b4..b28704a3b4 100644
--- a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
index 53b376d369..53b376d369 100644
--- a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
index 67299d322d..67299d322d 100644
--- a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
index a819dfd87d..a819dfd87d 100644
--- a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
index e8611d510f..e8611d510f 100644
--- a/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/resources/ab.composite
index b4ad1e77d5..b4ad1e77d5 100644
--- a/branches/sca-android/vtest/java-api/annotations/reference/src/main/resources/ab.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/main/resources/ab.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
index 1fe50b4ea7..1fe50b4ea7 100644
--- a/branches/sca-android/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/pom.xml
index d7de001183..d7de001183 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
index b7cf3fba71..b7cf3fba71 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
index 7da9d29424..7da9d29424 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/BService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
index 208c6a78b0..208c6a78b0 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/CService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
index d4cedcc979..d4cedcc979 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/DService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
index 7844ba7b62..7844ba7b62 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/FService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
index 7a047414dc..7a047414dc 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/GService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
index 555cdd5be0..555cdd5be0 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/HService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
index 79e20a3879..79e20a3879 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/IService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
index 95813f0e32..95813f0e32 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/JService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
index b4c95965ff..b4c95965ff 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/KService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
index 5c0fc12fa3..5c0fc12fa3 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/LService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
index ab6a3f946a..ab6a3f946a 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/MService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
index c544bf6e02..c544bf6e02 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/NService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
index 0104030f2e..0104030f2e 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/OService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
index 9c17b06b16..9c17b06b16 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
index 2a8bd80e9a..2a8bd80e9a 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
index c99f5f5e74..c99f5f5e74 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
index cc41994106..cc41994106 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
index 4fb7386484..4fb7386484 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/FServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
index 994469cb3a..994469cb3a 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/GServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
index 2fa610def7..2fa610def7 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/HServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
index 12566dc5e4..12566dc5e4 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/IServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
index a5851598a0..a5851598a0 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/JServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
index 7088562c57..7088562c57 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/KServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
index 274e0570d9..274e0570d9 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/LServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
index 681b0b3776..681b0b3776 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/MServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
index 98b94a33c7..98b94a33c7 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/NServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
index 8cf39a072c..8cf39a072c 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/impl/OServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/main/resources/scope.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/resources/scope.composite
index 7c195b2b5d..7c195b2b5d 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/main/resources/scope.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/main/resources/scope.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
index 9821af4a27..9821af4a27 100644
--- a/branches/sca-android/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/scope/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/scope/ScopeAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/pom.xml
index a5162ea4d3..a5162ea4d3 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/pom.xml
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
index a923faf5ae..a923faf5ae 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/AService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
index 26bcf3b9db..26bcf3b9db 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/BService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
index 4f4f1e80c7..4f4f1e80c7 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/CService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
index ffabb3619c..ffabb3619c 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService1.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
index 83d7980dbc..83d7980dbc 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService2.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
index a416e33de7..a416e33de7 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/DService3.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
index ad44d2b93a..ad44d2b93a 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/EService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
index 52886131a1..52886131a1 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/FService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
index bd1a3a5fe6..bd1a3a5fe6 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService1.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
index 0f8c7dabcb..0f8c7dabcb 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/GService2.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
index e50e230bd4..e50e230bd4 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/HService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
index e3a1462f88..e3a1462f88 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/IService.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
index 0ab2e29194..0ab2e29194 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AObject.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
index 7ce2235719..7ce2235719 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
index 9c3f15743c..9c3f15743c 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
index 3fc23d2f68..3fc23d2f68 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
index 4cc9430c74..4cc9430c74 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
index a64d434a46..a64d434a46 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/EServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
index 49f34738ef..49f34738ef 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
index 46370b7e19..46370b7e19 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/FServiceImpl2.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
index a86d6e1da0..a86d6e1da0 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/GServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
index ac525ea669..ac525ea669 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/HServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
index f2760b96ab..f2760b96ab 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/impl/IServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/main/resources/service.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/resources/service.composite
index 0731986df2..0731986df2 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/main/resources/service.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/main/resources/service.composite
diff --git a/branches/sca-android/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
index 52f7821ebb..52f7821ebb 100644
--- a/branches/sca-android/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/annotations/service/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/service/ServiceAnnotationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/apis/callablereference/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/pom.xml
index d4af5b79db..d4af5b79db 100644
--- a/branches/sca-android/vtest/java-api/apis/callablereference/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/pom.xml
diff --git a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
index a3f6d48685..a3f6d48685 100644
--- a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/AComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
index 707568e507..707568e507 100644
--- a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BCallback.java
diff --git a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
index 1a62b86c22..1a62b86c22 100644
--- a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/BComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
index 51ee68a393..51ee68a393 100644
--- a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/AComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
index f66db33a83..f66db33a83 100644
--- a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/impl/BComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
index f997d78bb5..f997d78bb5 100644
--- a/branches/sca-android/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/main/resources/callablereference.composite
diff --git a/branches/sca-android/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
index 4d0d8338ba..4d0d8338ba 100644
--- a/branches/sca-android/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/callablereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/callablereference/CallableReferenceTestCase.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/pom.xml
index 9af4b21f8a..9af4b21f8a 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/pom.xml
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
index b2c8c07866..b2c8c07866 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/AComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
index 7e425c740f..7e425c740f 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
index eff7cc5a88..eff7cc5a88 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/BService.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
index d0da012f6f..d0da012f6f 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/CService.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
index a221ba11fc..a221ba11fc 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/DComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
index 606443a480..606443a480 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
index 34a71e1318..34a71e1318 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/AUnannotatedComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
index 71d2eade2b..71d2eade2b 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/BComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
index 4b2c8c183b..4b2c8c183b 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/impl/DComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
index 19f110d5dc..19f110d5dc 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/main/resources/ab.composite
diff --git a/branches/sca-android/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
index 4e05aa2252..4e05aa2252 100644
--- a/branches/sca-android/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/componentcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/componentcontext/ComponentContextTestCase.java
diff --git a/branches/sca-android/vtest/java-api/apis/conversation/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/pom.xml
index 143d6f1788..143d6f1788 100644
--- a/branches/sca-android/vtest/java-api/apis/conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/pom.xml
diff --git a/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
index 805c1f2750..805c1f2750 100644
--- a/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/AComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
index abd8602705..abd8602705 100644
--- a/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/BComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
index 616155ccdf..616155ccdf 100644
--- a/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/AComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
index 66a3d3c72c..66a3d3c72c 100644
--- a/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/impl/BComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/conversation/src/main/resources/conversation.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
index 87cab2f479..87cab2f479 100644
--- a/branches/sca-android/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/main/resources/conversation.composite
diff --git a/branches/sca-android/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
index 9b46ac5e08..9b46ac5e08 100644
--- a/branches/sca-android/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/conversation/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/conversation/ConversationTestCase.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/pom.xml
index e3325aaa07..e3325aaa07 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/pom.xml
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
index 5c3755b19f..5c3755b19f 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/AComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
index c1c1c6544c..c1c1c6544c 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BCallback.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
index 6893a3b4b8..6893a3b4b8 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/BComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
index 519e66f1ce..519e66f1ce 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/CComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
index d0ef71a926..d0ef71a926 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
index 82873ed96d..82873ed96d 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/DException.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
index b4d6e929c5..b4d6e929c5 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/AComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
index 245401e8aa..245401e8aa 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/BComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
index 2546548e1c..2546548e1c 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/CComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
index 1cbda7e10b..1cbda7e10b 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/impl/DComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/main/resources/exception.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/resources/exception.composite
index 5bd933ce96..5bd933ce96 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/main/resources/exception.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/main/resources/exception.composite
diff --git a/branches/sca-android/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
index 9ff7e8e28f..9ff7e8e28f 100644
--- a/branches/sca-android/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/exception/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/exception/ExceptionTestCase.java
diff --git a/branches/sca-android/vtest/java-api/apis/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/pom.xml
index b1b2fc3e6b..b1b2fc3e6b 100644
--- a/branches/sca-android/vtest/java-api/apis/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/pom.xml
diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/pom.xml
index 7f18df910c..7f18df910c 100644
--- a/branches/sca-android/vtest/java-api/apis/requestcontext/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/pom.xml
diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
index 6fec5cada3..6fec5cada3 100644
--- a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
index 4dd2088f90..4dd2088f90 100644
--- a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java
diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
index 34f709d175..34f709d175 100644
--- a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
index c6fa589ed4..c6fa589ed4 100644
--- a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
index 33ff829357..33ff829357 100644
--- a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
index 4aa5eeb25a..4aa5eeb25a 100644
--- a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite
diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
index 65a1dbf88b..65a1dbf88b 100644
--- a/branches/sca-android/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/pom.xml
index f792cff7e5..f792cff7e5 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/pom.xml
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
index a1745f400e..a1745f400e 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/AComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
index f8c5c1272f..f8c5c1272f 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BCallback.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
index 33a4d6edcc..33a4d6edcc 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/BComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
index 28c90e2071..28c90e2071 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/CComponent.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
index 545d037c53..545d037c53 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/AComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
index f4307667b6..f4307667b6 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/BComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
index 099655ea22..099655ea22 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/CComponentImpl.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
index ba3edf13ae..ba3edf13ae 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/impl/TestObject.java
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
index 9bded61947..9bded61947 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/main/resources/servicereference.composite
diff --git a/branches/sca-android/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
index fda917d60a..fda917d60a 100644
--- a/branches/sca-android/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/apis/servicereference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/servicereference/ServiceReferenceTestCase.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/pom.xml
index c8abe7ced7..c8abe7ced7 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/pom.xml
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
index e78736d4df..e78736d4df 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
index 0a90f9c99a..0a90f9c99a 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/AServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
index 0e61247294..0e61247294 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
index e317a6e7e0..e317a6e7e0 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/BServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
index 6446e006bd..6446e006bd 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
index 15672f9ee0..15672f9ee0 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/Utilities.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
index 400c696d82..400c696d82 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/AServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
index 33421cb4d0..33421cb4d0 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
index 1b220abf69..1b220abf69 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
index 957957a2e4..957957a2e4 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/accessing/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
index 4ef741c1c1..4ef741c1c1 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/AServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
index bba4bf2611..bba4bf2611 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
index 4fb4fa53de..4fb4fa53de 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/CustomCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
index 83453397b2..83453397b2 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
index c165aa51da..c165aa51da 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
index c0440a2b1b..c0440a2b1b 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/custom/impl/CustomCallbackImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
index 8a237af0ad..8a237af0ad 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/AServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
index 9c185ddee3..9c185ddee3 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
index 2e79d135f4..2e79d135f4 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
index fb0d6b8a50..fb0d6b8a50 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/id/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
index 1ace5858b2..1ace5858b2 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
index 52d8fe5a7e..52d8fe5a7e 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
index eea769b2fb..eea769b2fb 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
index 1caa467348..1caa467348 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/AServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
index a7f471aa26..a7f471aa26 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
index 4aeeca6dc3..4aeeca6dc3 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/BServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
index 014f1edd33..014f1edd33 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/CService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
index 4e6dce6fb9..4e6dce6fb9 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
index 2f560fe87b..2f560fe87b 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
index 23e0d0e70b..23e0d0e70b 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/local/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
index 705e101a01..705e101a01 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/CService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
index c03b1aedc4..c03b1aedc4 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
index 8e068c8be4..8e068c8be4 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/mixed/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
index 16b2932afc..16b2932afc 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
index 56b7006581..56b7006581 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/AServiceCallback2.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
index 580cf5a612..580cf5a612 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
index 144492984a..144492984a 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/BService2.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
index ce7214dba1..ce7214dba1 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
index b61a15cbee..b61a15cbee 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
index cb9aee2b9f..cb9aee2b9f 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/BServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
index 1fe70344af..1fe70344af 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/CService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
index 033fa9d097..033fa9d097 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
index 5f7d8d9c94..5f7d8d9c94 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl2.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
index 47d5d53821..47d5d53821 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/BServiceImpl3.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
index 18ce5edebe..18ce5edebe 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/stateless/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
index 802c9c30db..802c9c30db 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-accessing.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
index e66ea5d537..e66ea5d537 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-custom.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
index 4d93d2279d..4d93d2279d 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-id.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
index cd8c589a59..cd8c589a59 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-local.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
index d2d9956103..d2d9956103 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-mixed.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
index 6c69330ce5..6c69330ce5 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-multi.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
index 72c08e8344..72c08e8344 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackfieldnull.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
index 144f7f3d00..144f7f3d00 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless-callbackid.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
index ace06b245c..ace06b245c 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback-stateless.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback.composite
index 4623f17ca2..4623f17ca2 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/main/resources/callback.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
index dc681a4e7e..dc681a4e7e 100644
--- a/branches/sca-android/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
diff --git a/branches/sca-android/vtest/java-api/conversation/id/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/pom.xml
index 77a52c6237..77a52c6237 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/pom.xml
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
index f49952828c..f49952828c 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/AService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
index d4641c5ee6..d4641c5ee6 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
index 66a9b3b6c3..66a9b3b6c3 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
index ac40c56ee6..ac40c56ee6 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/CustomConversationId.java
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
index 517976ff73..517976ff73 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
index 752476ebf7..752476ebf7 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
index a01ceb7be4..a01ceb7be4 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
index 25e7154fca..25e7154fca 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/main/resources/conversation-id.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
index d3cb107a61..d3cb107a61 100644
--- a/branches/sca-android/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/id/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/id/ConversationIDTestCase.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/pom.xml
index 0d6c0f763c..0d6c0f763c 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/pom.xml
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
index 8deef5df31..8deef5df31 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
index 5a20f4d960..5a20f4d960 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/AServiceCallback.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
index 6368b1157b..6368b1157b 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
index ab186ee7eb..ab186ee7eb 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/BServiceBusinessException.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
index dcc2e5d9c4..dcc2e5d9c4 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/CService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
index 06d40accd4..06d40accd4 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/DService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
index 56bfcabfc4..56bfcabfc4 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
index 0919734c7a..0919734c7a 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
index d9910d445c..d9910d445c 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
index 34c57e402e..34c57e402e 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
index 21ee8acac1..21ee8acac1 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/main/resources/lifetime.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
index 987ac3539f..987ac3539f 100644
--- a/branches/sca-android/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/lifetime/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/lifetime/LifetimeTestCase.java
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/pom.xml
index c6e46cb95c..c6e46cb95c 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/pom.xml
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
index bd19b504d9..bd19b504d9 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/AService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
index 8a5ef43a4b..8a5ef43a4b 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/BService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
index e9a6dc469d..e9a6dc469d 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/CService.java
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
index 0ef2f219f7..0ef2f219f7 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
index ab0b05d163..ab0b05d163 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
index 27d0210fca..27d0210fca 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
index a8500dfb09..a8500dfb09 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/main/resources/parameters.composite
diff --git a/branches/sca-android/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
index 929fe06115..929fe06115 100644
--- a/branches/sca-android/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/parameters/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/parameters/ConversationParametersTestCase.java
diff --git a/branches/sca-android/vtest/java-api/conversation/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/pom.xml
index 67aa9702be..67aa9702be 100644
--- a/branches/sca-android/vtest/java-api/conversation/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/conversation/pom.xml
diff --git a/branches/sca-android/vtest/java-api/pom.xml b/sca-java-1.x/branches/sca-android/vtest/java-api/pom.xml
index 198af57bbc..198af57bbc 100644
--- a/branches/sca-android/vtest/java-api/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/java-api/pom.xml
diff --git a/branches/sca-android/vtest/pom.xml b/sca-java-1.x/branches/sca-android/vtest/pom.xml
index 63086d522d..63086d522d 100644
--- a/branches/sca-android/vtest/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/pom.xml
diff --git a/branches/sca-android/vtest/processcomments.rb b/sca-java-1.x/branches/sca-android/vtest/processcomments.rb
index b7a7fc1cc3..b7a7fc1cc3 100644
--- a/branches/sca-android/vtest/processcomments.rb
+++ b/sca-java-1.x/branches/sca-android/vtest/processcomments.rb
diff --git a/branches/sca-android/vtest/utilities/pom.xml b/sca-java-1.x/branches/sca-android/vtest/utilities/pom.xml
index de25c30cce..de25c30cce 100644
--- a/branches/sca-android/vtest/utilities/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/utilities/pom.xml
diff --git a/branches/sca-android/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java b/sca-java-1.x/branches/sca-android/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
index 9b6792e51b..9b6792e51b 100644
--- a/branches/sca-android/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
+++ b/sca-java-1.x/branches/sca-android/vtest/utilities/src/main/java/org/apache/tuscany/sca/vtest/utilities/ServiceFinder.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
index c2a276df13..c2a276df13 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
index cba68beb65..cba68beb65 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/AService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
index 43e35564b5..43e35564b5 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/BService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
index 8838c07899..8838c07899 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/CService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
index 27eee2de0a..27eee2de0a 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/DService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
index da767518ec..da767518ec 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
index 4402b76f3a..4402b76f3a 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
index 8392f5ed81..8392f5ed81 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
index 8064abf235..8064abf235 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
index 39d66fa365..39d66fa365 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/main/resources/nowsdl.composite
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
index b50774cfa9..b50774cfa9 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/defaultbinding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/defaultbinding/NoWsdlDefaultBindingTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
index 6cdab80d1d..6cdab80d1d 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
index 4acfc5ca3f..4acfc5ca3f 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/AService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
index fa2f11b495..fa2f11b495 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/BService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
index b55df2c0ae..b55df2c0ae 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/CService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
index e39103a436..e39103a436 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/DService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
index 650d3295a6..650d3295a6 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
index 69d993251b..69d993251b 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
index ddcfc01416..ddcfc01416 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
index a3081b3bf4..a3081b3bf4 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
index 8cd599354a..8cd599354a 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/main/resources/nowsdlmultisoapbindings.composite
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
index ae058cf6c9..ae058cf6c9 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/GeneratedWSDLTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
index 5dbb696bf5..5dbb696bf5 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/multisoapbindings/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/multisoapbindings/NoWsdlMultiSoapBindingsTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/pom.xml
index 7167bdcc4a..7167bdcc4a 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/pom.xml
index ab19ed9034..ab19ed9034 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
index 6ab6fbb8f5..6ab6fbb8f5 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
index f3c42008aa..f3c42008aa 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
index 1215d9d41f..1215d9d41f 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
index 774b68bf6d..774b68bf6d 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
index 952df7ccfe..952df7ccfe 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
index 9111b5c3a9..9111b5c3a9 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
index 5aa508d8f1..5aa508d8f1 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
index 055283bfad..055283bfad 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
index 8f776672de..8f776672de 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
index 7a5d91d762..7a5d91d762 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
index 121de12d3c..121de12d3c 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
index f05c8852f6..f05c8852f6 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
index 746b0a357f..746b0a357f 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
index 5be411b286..5be411b286 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
index f79df5bf8f..f79df5bf8f 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
index ae7dafa46e..ae7dafa46e 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
index a4744b9007..a4744b9007 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/pom.xml
index 6345eec911..6345eec911 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
index d5204634a6..d5204634a6 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/AService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
index 034aad7781..034aad7781 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
index 1c345428b3..1c345428b3 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
index 74dcccd898..74dcccd898 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP11.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
index a86922ef4f..a86922ef4f 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/BServiceSOAP12.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
index a809795657..a809795657 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/CService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
index 2c1642ff14..2c1642ff14 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/DService.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
index 657be52e7d..657be52e7d 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
index fb079fa8bc..fb079fa8bc 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
index 9f0e76ec10..9f0e76ec10 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP11Impl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
index 91e4ffbd7e..91e4ffbd7e 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAP12Impl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
index b8cd38bb09..b8cd38bb09 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/BServiceSOAPImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
index 250694dc36..250694dc36 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
index 9f6c29c643..9f6c29c643 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
index 61a658ab55..61a658ab55 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/main/resources/nowsdlsoapversion.composite
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
index d0e852fc7c..d0e852fc7c 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/GeneratedWSDLTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
index 896b5a3d89..896b5a3d89 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlNoSoapVersionTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
index c65f7e8e52..c65f7e8e52 100644
--- a/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/nowsdl/soapversion/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/soapversion/NoWsdlSoapVersionTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/pom.xml
index e984f8b4bd..e984f8b4bd 100644
--- a/branches/sca-android/vtest/wsbinding/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/service/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/pom.xml
index 3f0a2a4125..3f0a2a4125 100644
--- a/branches/sca-android/vtest/wsbinding/service/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
index 397f6b4c5a..397f6b4c5a 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AClientService.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
index b97e0cfebb..b97e0cfebb 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/AService.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
index 8d9e6de816..8d9e6de816 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AClientServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
index 450da9cbcf..450da9cbcf 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/resources/aservice.wsdl b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/aservice.wsdl
index e7953eb2b4..e7953eb2b4 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/resources/aservice.wsdl
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/aservice.wsdl
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
index 0d92174442..0d92174442 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/endpoint-uri-resolution.composite
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/resources/endpointreference.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/endpointreference.composite
index 3ba152b7b8..3ba152b7b8 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/resources/endpointreference.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/endpointreference.composite
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
index 85c604070a..85c604070a 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlbinding.composite
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
index 0c11c79efe..0c11c79efe 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlendpoint.composite
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlport.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlport.composite
index 859b93bec4..859b93bec4 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlport.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlport.composite
diff --git a/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlservice.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
index fa96e650de..fa96e650de 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/main/resources/wsdlservice.composite
diff --git a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
index d858daaf78..d858daaf78 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointReferenceTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
index 49f9db248f..49f9db248f 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/EndpointUriResolutionTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
index 292de8b654..292de8b654 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlBindingTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
index 842da87bd4..842da87bd4 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlEndpointTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
index 0545cef776..0545cef776 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlPortTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
index aa2b2fac7a..aa2b2fac7a 100644
--- a/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/WsdlServiceTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/pom.xml
index 205fbcc785..205fbcc785 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
index 49d12876e5..49d12876e5 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/AService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
index b303f09dbc..b303f09dbc 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
index 7089663cf1..7089663cf1 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/BService2.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
index 56f7415208..56f7415208 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/CService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
index 90a78d3f0f..90a78d3f0f 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/DService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
index ce5adf2cc5..ce5adf2cc5 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
index 4040108542..4040108542 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BService2Impl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
index 66c9cb4136..66c9cb4136 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
index ecdfbd59e2..ecdfbd59e2 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
index 06470f29f9..06470f29f9 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
index 8ce0fbaeb8..8ce0fbaeb8 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/bservice.wsdl
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
index ff151faa7a..ff151faa7a 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/cservice.wsdl
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
index 6b97b5e602..6b97b5e602 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/main/resources/wsdlelement.binding.composite
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
index f30cf38654..f30cf38654 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/binding/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/binding/WsdlElementBindingTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/pom.xml
index e1707234dc..e1707234dc 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/pom.xml
index 777e7cc210..777e7cc210 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
index a0ed87249f..a0ed87249f 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/AService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
index 1bdabeaea7..1bdabeaea7 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
index 3952d8c792..3952d8c792 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/BService2.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
index 244907fa19..244907fa19 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/CService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
index 519374c1bd..519374c1bd 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/DService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
index 558ddcbb49..558ddcbb49 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
index b1dd73edc8..b1dd73edc8 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BService2Impl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
index b132fca45b..b132fca45b 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
index ca3ec62b83..ca3ec62b83 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
index 767deae23f..767deae23f 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
index d5c8d72dc1..d5c8d72dc1 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/bservice.wsdl
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
index 8a715a2081..8a715a2081 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/cservice.wsdl
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
index 5b9b77683e..5b9b77683e 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/main/resources/wsdlelement.port.composite
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
index 0db579002b..0db579002b 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/port/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/port/WsdlElementPortTestCase.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/pom.xml b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/pom.xml
index 149037cf4d..149037cf4d 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/pom.xml
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/pom.xml
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
index 69b709ae95..69b709ae95 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/AService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
index 852f36e0c1..852f36e0c1 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
index bfcacdaa21..bfcacdaa21 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/BService2.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
index 5ceab40d0e..5ceab40d0e 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/CService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
index 5182ee3029..5182ee3029 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/DService.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
index e89cf21215..e89cf21215 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/AServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
index b8c23433eb..b8c23433eb 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BService2Impl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
index cbbf8222e6..cbbf8222e6 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/BServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
index 29a22f31bd..29a22f31bd 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/CServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
index 87654e7188..87654e7188 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/impl/DServiceImpl.java
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
index 521f077c46..521f077c46 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/bservice.wsdl
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
index bdf294b473..bdf294b473 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/cservice.wsdl
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
index 9801ecd037..9801ecd037 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/main/resources/wsdlelement.service.composite
diff --git a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
index 22d2a80244..22d2a80244 100644
--- a/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-android/vtest/wsbinding/wsdlelement/service/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/wsdlelement/service/WsdlElementServiceTestCase.java