204 files changed, 0 insertions, 0 deletions

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