222 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/LICENSE b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/LICENSE
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/LICENSE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/META-INF/MANIFEST.MF
index 25cd7c4695..25cd7c4695 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/NOTICE b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/NOTICE
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/NOTICE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/pom.xml b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/pom.xml
index afc8348b4c..afc8348b4c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index fa58232703..fa58232703 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 969115cf4c..969115cf4c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 166bba8757..166bba8757 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index a8c2d6a7e9..a8c2d6a7e9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index b6182e3950..b6182e3950 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 62ed95cb01..62ed95cb01 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 652d668577..652d668577 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index aed535cf0d..aed535cf0d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 3bf5a1173b..3bf5a1173b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 401fa7123e..401fa7123e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index d73ce5ab66..d73ce5ab66 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index d6c1b278bb..d6c1b278bb 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index b29910e215..b29910e215 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index 359f87c615..359f87c615 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7a190dea9c..7a190dea9c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 403c049b48..403c049b48 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
index 8cc5e5a5ec..8cc5e5a5ec 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index 62318946a2..62318946a2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
index 4e74c55949..4e74c55949 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index 98e1cf31ef..98e1cf31ef 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 03d99ff934..03d99ff934 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index beeb6feaea..beeb6feaea 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
index 2b1a8fecf7..2b1a8fecf7 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
index 37a142d2f4..37a142d2f4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index 6127e6cc91..6127e6cc91 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index cc5421cd84..cc5421cd84 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index cc8a88f3d5..cc8a88f3d5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index 1a100c25b1..1a100c25b1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
index d01e304aad..d01e304aad 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index c423df6f7d..c423df6f7d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index af25109de1..af25109de1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 5235df5037..5235df5037 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index df760c1d1f..df760c1d1f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
index dedd0d0660..dedd0d0660 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 602d42a06a..602d42a06a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index d6ec9b0ff0..d6ec9b0ff0 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 299eb8c197..299eb8c197 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index a221c23eec..a221c23eec 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index 2719ee9162..2719ee9162 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 2a0bcf0f76..2a0bcf0f76 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 7bc7ccdb83..7bc7ccdb83 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bcc8c54dc8..bcc8c54dc8 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 3bda9ac31c..3bda9ac31c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index b79cb6b7b7..b79cb6b7b7 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/LICENSE b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/LICENSE
index 646cd58e09..646cd58e09 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/LICENSE
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/LICENSE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/META-INF/MANIFEST.MF
index 7d6d0951f4..7d6d0951f4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/NOTICE b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/NOTICE
index 91c3b75575..91c3b75575 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/NOTICE
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/NOTICE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/pom.xml b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/pom.xml
index 0041132886..0041132886 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 69b2701e30..69b2701e30 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-all.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-all.xsd
index 63e83884e0..63e83884e0 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-all.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-all.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
index 93718aaa35..93718aaa35 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 2dd44f8e06..2dd44f8e06 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-contributions.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
index caf5d8010f..caf5d8010f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-core.xsd
index f03d0eab01..f03d0eab01 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-core.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-core.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
index a7e781b18f..a7e781b18f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-jee.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-jee.xsd
index 83e6bb75bf..83e6bb75bf 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-jee.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-jee.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
index a1adf10fd9..a1adf10fd9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-implementation-web.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
index 2c4875f36c..2c4875f36c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca.xsd
index e4471a4f51..e4471a4f51 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/sca.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
index d400810835..d400810835 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-corba.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-corba.xsd
index 0baa364f42..0baa364f42 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-corba.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-corba.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
index 788571de7b..788571de7b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-gdata.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-gdata.xsd
index 2096a014aa..2096a014aa 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-gdata.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-gdata.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
index bd36a8f52f..bd36a8f52f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
index b998427ecb..b998427ecb 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jms.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
index bacfdda781..bacfdda781 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
index 26be6feae5..26be6feae5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
index 5af65aced2..5af65aced2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
index 4331da0439..4331da0439 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-data-helper.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
index 1f6f9abb16..1f6f9abb16 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-das.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
index 4a06bdd36a..4a06bdd36a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-data-xml.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
index 213ba7da5e..213ba7da5e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/wsdli.xsd b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/wsdli.xsd
index 79af5e9363..79af5e9363 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/wsdli.xsd
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly-xsd/src/main/resources/wsdli.xsd
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/LICENSE b/sca-java-2.x/tags/2.0-M1/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/LICENSE
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/LICENSE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M1/modules/assembly/META-INF/MANIFEST.MF
index 06b5451177..06b5451177 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/NOTICE b/sca-java-2.x/tags/2.0-M1/modules/assembly/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/NOTICE
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/NOTICE
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/pom.xml b/sca-java-2.x/tags/2.0-M1/modules/assembly/pom.xml
index 48912c5427..48912c5427 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/pom.xml
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/pom.xml
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index b8487d95c5..b8487d95c5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 05f0e60981..05f0e60981 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 8a4fc6dfda..8a4fc6dfda 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index f8b7d4d236..f8b7d4d236 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
index b0bfdec6d7..b0bfdec6d7 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index f49a653aa9..f49a653aa9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 8e1943224c..8e1943224c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 13d19b1757..13d19b1757 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index ce40bc089b..ce40bc089b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index e1ea65ea39..e1ea65ea39 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 2c7b7c6b9e..2c7b7c6b9e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index 8832597343..8832597343 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 9890bfed68..9890bfed68 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index f9a62774e6..f9a62774e6 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
index 6b0c076ee5..6b0c076ee5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultEndpointFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultExtensionFactory.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultExtensionFactory.java
index 2ed02e214b..2ed02e214b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultExtensionFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultExtensionFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index ee63497fbe..ee63497fbe 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
index 93e6c4d630..93e6c4d630 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 593b7de88b..593b7de88b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
index 499c97c278..499c97c278 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ExtensionFactory.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ExtensionFactory.java
index 214cf59748..214cf59748 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ExtensionFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ExtensionFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 720a6801a2..720a6801a2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
index 6770e87ee1..6770e87ee1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 947fcd4c7c..947fcd4c7c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 98ff92f15b..98ff92f15b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 683920da58..683920da58 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 2eb1bf21b0..2eb1bf21b0 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 020870cd34..020870cd34 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index ee65e5746e..ee65e5746e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
index d8c530585e..d8c530585e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
index 97708f9ef5..97708f9ef5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/AutomaticBinding.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 7bac630d5b..7bac630d5b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
index 37ad8af0b3..37ad8af0b3 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilderExtension.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index d2fae4d24a..d2fae4d24a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 8a18f74b2b..8a18f74b2b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
index a2d6b34db5..a2d6b34db5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderExtensionPoint.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
index 8197bf2552..8197bf2552 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultCompositeBuilderExtensionPoint.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
index 30b929c43c..30b929c43c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultEndpointBuilder.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 20a17e1bd0..20a17e1bd0 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
index e98be49551..e98be49551 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointBuilder.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
index 77094da6dd..77094da6dd 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
index 64747978a5..64747978a5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentConfigurationBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
index 734b373f11..734b373f11 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceBindingBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
index 4ceb4bb079..4ceb4bb079 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferencePromotionWireBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
index 4e2bb11975..4e2bb11975 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceWireBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
index c725ea8947..c725ea8947 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceBindingBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
index b9646acb20..b9646acb20 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServicePromotionBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
index d31a38c70b..d31a38c70b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingConfigurationBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
index 6b9d5d9c46..6b9d5d9c46 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBindingURIBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index 9846edc127..9846edc127 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index 21e5192ae8..21e5192ae8 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index 730c002468..730c002468 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
index 76cd8256e2..76cd8256e2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
index abacc06067..abacc06067 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePromotionBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
index a89f0d402f..a89f0d402f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceConfigurationBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
index 3786cdfa38..3786cdfa38 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeReferenceWireBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
index 6a8da7241a..6a8da7241a 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceBindingBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
index 2fc5e571b2..2fc5e571b2 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServiceConfigurationBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
index 3004a9f590..3004a9f590 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeServicePromotionBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
index 125112a560..125112a560 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/EndpointBuilderImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
index 944cf2cf36..944cf2cf36 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationException.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
index c0bc18dfaf..c0bc18dfaf 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index 3762cc6e77..3762cc6e77 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
index 0105d4af50..0105d4af50 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyConfigurationUtil.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
index 0612f9ae0e..0612f9ae0e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
index 41a8b3f8ba..41a8b3f8ba 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ServiceConfigurationUtil.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index b7c63dc2b4..b7c63dc2b4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 016a9a5b05..016a9a5b05 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 4082d81fdb..4082d81fdb 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 34429a6703..34429a6703 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index e2e7b59896..e2e7b59896 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 488023090c..488023090c 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index bbe665d52f..bbe665d52f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 9dd26b5e8e..9dd26b5e8e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 1373ce511b..1373ce511b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index d5701df74e..d5701df74e 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 491c835246..491c835246 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
index ece51cbe9b..ece51cbe9b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointFactoryImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 5748abb07d..5748abb07d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 761799a4d5..761799a4d5 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
index 2753bcc091..2753bcc091 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index aa75922489..aa75922489 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 0c1051199f..0c1051199f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 1800222bfb..1800222bfb 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 8d745cb7e1..8d745cb7e1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 1a7abc8564..1a7abc8564 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
index 8dbff76ad9..8dbff76ad9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.EndpointFactory
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.ExtensionFactory b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.ExtensionFactory
index bea25da958..bea25da958 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.ExtensionFactory
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.ExtensionFactory
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
index 9fbabd0c3f..9fbabd0c3f 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
index 693834e23d..693834e23d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/assembly-validation-messages.properties b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/assembly-validation-messages.properties
index 6aeda18aab..6aeda18aab 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/assembly-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/assembly-validation-messages.properties
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/assembly-validation-messages_it.properties b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
index b94d37ba2d..b94d37ba2d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/main/resources/assembly-validation-messages_it.properties
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index e73119204d..e73119204d 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 5e0a2335d1..5e0a2335d1 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 19702954c9..19702954c9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index 2992aeb263..2992aeb263 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index 82b1fd8665..82b1fd8665 100644
--- a/sca-java-1.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-2.x/tags/2.0-M1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java