Moving 2.x branches

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

217 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF
index b34277f708..b34277f708 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml
index 79653e8e2a..79653e8e2a 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index b4fe17770c..b4fe17770c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 969115cf4c..969115cf4c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 166bba8757..166bba8757 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 0ea78177ff..0ea78177ff 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index ec059ace81..ec059ace81 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index d077bc63a0..d077bc63a0 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 7a2eba494f..7a2eba494f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index ce8b461a27..ce8b461a27 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 401fa7123e..401fa7123e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index d73ce5ab66..d73ce5ab66 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index 34c4bc9909..34c4bc9909 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index 0cf02b6e61..0cf02b6e61 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
index 8eebf1f5e5..8eebf1f5e5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
index d69f30aceb..d69f30aceb 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
index dfdc26f7ad..dfdc26f7ad 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 565fe12329..565fe12329 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 403c049b48..403c049b48 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
index 8cc5e5a5ec..8cc5e5a5ec 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index fa0e9bdf5b..fa0e9bdf5b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
index 4e74c55949..4e74c55949 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index 54d8f3d260..54d8f3d260 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 463e6fec82..463e6fec82 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index beeb6feaea..beeb6feaea 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
index a4f0da5ae9..a4f0da5ae9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
index 256c706035..256c706035 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index 6c8aa9acc9..6c8aa9acc9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index d9be1dff90..d9be1dff90 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index cc8a88f3d5..cc8a88f3d5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index 1a100c25b1..1a100c25b1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
index e1a149494d..e1a149494d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index cbfec53f65..cbfec53f65 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index d41881dc37..d41881dc37 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 5235df5037..5235df5037 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index cf86aec6f4..cf86aec6f4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
index dedd0d0660..dedd0d0660 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 961a40b841..961a40b841 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 9a43d44377..9a43d44377 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 2f4518a42c..2f4518a42c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index d713a381f9..d713a381f9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index bf3676c585..bf3676c585 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 9f40faa806..9f40faa806 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 65e709f9b1..65e709f9b1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 998a49226b..998a49226b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 661270d341..661270d341 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bb1f3118ce..bb1f3118ce 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 6aa2ab4979..6aa2ab4979 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index c59fb3537b..c59fb3537b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/LICENSE
index 2ea1dcc129..2ea1dcc129 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/META-INF/MANIFEST.MF
index cabc686fcf..cabc686fcf 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/NOTICE
index 78da9f5010..78da9f5010 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/pom.xml
index 3e6a13468f..3e6a13468f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 5007705d41..5007705d41 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
index e8e8f7625a..e8e8f7625a 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
index 685e89a57e..685e89a57e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
index 7596dc5dc1..7596dc5dc1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
index e088d137e4..e088d137e4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
index d4f272ec7f..d4f272ec7f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
index 8d4bd32fc4..8d4bd32fc4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
index 24e0b5a975..24e0b5a975 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
index 267b0d33b4..267b0d33b4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
index df126b30e6..df126b30e6 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
index edd3187ae1..edd3187ae1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
index 490c9659f4..490c9659f4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
index 6a898c7e7b..6a898c7e7b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
index 7a6d1a903b..7a6d1a903b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd03.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
index bae52390fa..bae52390fa 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
index 8445749363..8445749363 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
index 4397834520..4397834520 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
index 2271b780ee..2271b780ee 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
index 8923a4b9e2..8923a4b9e2 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd
index 0c5f75e56f..0c5f75e56f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd03.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
index 0feadcddcd..0feadcddcd 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd03.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
index 3c19424a83..3c19424a83 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
index 11e191f0ed..11e191f0ed 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
index 050f456386..050f456386 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd03.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
index 771186a91d..771186a91d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
index 52c92e8259..52c92e8259 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd01.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd
index 1e64dd0e47..1e64dd0e47 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
index f2c7d2034f..f2c7d2034f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
index c214f7c37b..c214f7c37b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
index 6acbe6cf1c..6acbe6cf1c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd03.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
index f3abba888e..f3abba888e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd03.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
index b3de95509e..b3de95509e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd02.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml
index 2e96713233..2e96713233 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd02.xml
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
index bb3ad00cd7..bb3ad00cd7 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
index 32f2a51276..32f2a51276 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
index 68dea85a12..68dea85a12 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
index fadf94fffe..fadf94fffe 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
index 65d85066ae..65d85066ae 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index d36fff3ca1..d36fff3ca1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
diff --git a/branches/sca-java-2.0-M3/modules/assembly/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/assembly/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/META-INF/MANIFEST.MF
index 544337cd89..544337cd89 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/assembly/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/assembly/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/pom.xml
index 7c3374bfe5..7c3374bfe5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index 0a14b5658e..0a14b5658e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index fcad39d8cb..fcad39d8cb 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 3c850dc053..3c850dc053 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 0423e0b128..0423e0b128 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
index b0bfdec6d7..b0bfdec6d7 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index d34ec7d01f..d34ec7d01f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 7386fc8583..7386fc8583 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 13d19b1757..13d19b1757 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index e18d4d5d8c..e18d4d5d8c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index 9fb3b92102..9fb3b92102 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 12542297b3..12542297b3 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index 9defd8f66c..9defd8f66c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 74c2e70d30..74c2e70d30 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 54d6347301..54d6347301 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 6d8350fc66..6d8350fc66 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
index f8adb980be..f8adb980be 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index 5aa26e16cf..5aa26e16cf 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index 204719e7e4..204719e7e4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 90d6745f35..90d6745f35 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
index 4d5b1a2ecd..4d5b1a2ecd 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 720a6801a2..720a6801a2 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
index 6770e87ee1..6770e87ee1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 98ff92f15b..98ff92f15b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 986e1f12e4..986e1f12e4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 08344ca24f..08344ca24f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 74dde43614..74dde43614 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index e597a50f30..e597a50f30 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index e1eb26f0c1..e1eb26f0c1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
index d8c530585e..d8c530585e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
index 97708f9ef5..97708f9ef5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 7bac630d5b..7bac630d5b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
index 37ad8af0b3..37ad8af0b3 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index d2fae4d24a..d2fae4d24a 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 8a18f74b2b..8a18f74b2b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
index a2d6b34db5..a2d6b34db5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
index 32444349b2..32444349b2 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 20a17e1bd0..20a17e1bd0 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java
index 220d82eab9..220d82eab9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
index 59dbc85d1f..59dbc85d1f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
index fc769f5037..fc769f5037 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
index 734b373f11..734b373f11 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
index 5439ca538f..5439ca538f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionBuilderImpl.java
index eb06f67f8e..eb06f67f8e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
index 5552fda286..5552fda286 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
index dc0a9298fa..dc0a9298fa 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
index c725ea8947..c725ea8947 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
index 00674b1f27..00674b1f27 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
index d5a94e0ee9..d5a94e0ee9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
index d31a38c70b..d31a38c70b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
index 6b9d5d9c46..6b9d5d9c46 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index ad60c3b200..ad60c3b200 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index 21e5192ae8..21e5192ae8 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index 730c002468..730c002468 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
index 5c3249369b..5c3249369b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
index e2f17f5efd..e2f17f5efd 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
index 07422ef9f2..07422ef9f2 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
index 451b378941..451b378941 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
index 6a8da7241a..6a8da7241a 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
index 099996d244..099996d244 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
index 3004a9f590..3004a9f590 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
index 944cf2cf36..944cf2cf36 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
index a7a40e62e6..a7a40e62e6 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index 3762cc6e77..3762cc6e77 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
index 0105d4af50..0105d4af50 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
index 9f810a2c60..9f810a2c60 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
index 41a8b3f8ba..41a8b3f8ba 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index db4bcb0060..db4bcb0060 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index ab43fc5b5d..ab43fc5b5d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
index 1e69dfcc87..1e69dfcc87 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index f8f856f1b4..f8f856f1b4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index d751d59f83..d751d59f83 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e2e7b59896..e2e7b59896 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index bb5b163762..bb5b163762 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index c79aaf6b2e..c79aaf6b2e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 4e14cf0e53..4e14cf0e53 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 97b0db3bcc..97b0db3bcc 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index 641e0f17df..641e0f17df 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index a121635323..a121635323 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
index 898aec0c42..898aec0c42 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 1974113d1c..1974113d1c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
index aad851eb3b..aad851eb3b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 761799a4d5..761799a4d5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
index 9befad9f2b..9befad9f2b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 1c28192b3a..1c28192b3a 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 0c1051199f..0c1051199f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 454a24225f..454a24225f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index 7e311d8312..7e311d8312 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index 4a962db005..4a962db005 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 8f1ce29fdb..8f1ce29fdb 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 9f8af0907d..9f8af0907d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
index 8dbff76ad9..8dbff76ad9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 9aabbad24e..9aabbad24e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
index b7ba756879..b7ba756879 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
index 693834e23d..693834e23d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/assembly-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/assembly-validation-messages.properties
index cfa76800eb..cfa76800eb 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/assembly-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/assembly-validation-messages.properties
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/assembly-validation-messages_it.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
index b94d37ba2d..b94d37ba2d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index e73119204d..e73119204d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 3a75bbcc36..3a75bbcc36 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 19702954c9..19702954c9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index 2992aeb263..2992aeb263 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index 82b1fd8665..82b1fd8665 100644
--- a/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java