summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite)0
-rw-r--r--sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml (renamed from branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml)0
52 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/LICENSE
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF
index b34277f708..b34277f708 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/NOTICE
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml
index 79653e8e2a..79653e8e2a 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/pom.xml
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index b4fe17770c..b4fe17770c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 969115cf4c..969115cf4c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 166bba8757..166bba8757 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 0ea78177ff..0ea78177ff 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index ec059ace81..ec059ace81 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index d077bc63a0..d077bc63a0 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 7a2eba494f..7a2eba494f 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index ce8b461a27..ce8b461a27 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 401fa7123e..401fa7123e 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index d73ce5ab66..d73ce5ab66 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index 34c4bc9909..34c4bc9909 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index 0cf02b6e61..0cf02b6e61 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
index 8eebf1f5e5..8eebf1f5e5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
index d69f30aceb..d69f30aceb 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
index dfdc26f7ad..dfdc26f7ad 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 565fe12329..565fe12329 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 403c049b48..403c049b48 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
index 8cc5e5a5ec..8cc5e5a5ec 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/main/resources/assembly-xml-validation-messages.properties
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index fa0e9bdf5b..fa0e9bdf5b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
index 4e74c55949..4e74c55949 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index 54d8f3d260..54d8f3d260 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 463e6fec82..463e6fec82 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index beeb6feaea..beeb6feaea 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
index a4f0da5ae9..a4f0da5ae9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
index 256c706035..256c706035 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index 6c8aa9acc9..6c8aa9acc9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index d9be1dff90..d9be1dff90 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index cc8a88f3d5..cc8a88f3d5 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index 1a100c25b1..1a100c25b1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
index e1a149494d..e1a149494d 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index cbfec53f65..cbfec53f65 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index d41881dc37..d41881dc37 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 5235df5037..5235df5037 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index cf86aec6f4..cf86aec6f4 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
index dedd0d0660..dedd0d0660 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 961a40b841..961a40b841 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 9a43d44377..9a43d44377 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 2f4518a42c..2f4518a42c 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index d713a381f9..d713a381f9 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index bf3676c585..bf3676c585 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 9f40faa806..9f40faa806 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 65e709f9b1..65e709f9b1 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 998a49226b..998a49226b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 661270d341..661270d341 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bb1f3118ce..bb1f3118ce 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 6aa2ab4979..6aa2ab4979 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
diff --git a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index c59fb3537b..c59fb3537b 100644
--- a/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M3/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml