284 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/LICENSE b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/LICENSE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/META-INF/MANIFEST.MF
index 57e693005b..57e693005b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/NOTICE b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/NOTICE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/pom.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/pom.xml
index 3e6cfe2d6c..3e6cfe2d6c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 1b64c9aa33..1b64c9aa33 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index b5fe005812..b5fe005812 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 9a4a0dc035..9a4a0dc035 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index b402b6e3a3..b402b6e3a3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index 5ba42a0dec..5ba42a0dec 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 7a396fe100..7a396fe100 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 2cace7d68d..2cace7d68d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index 9930096a26..9930096a26 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 9fd8aeb803..9fd8aeb803 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index e6e172a44b..e6e172a44b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
index 9b2b1cca6c..9b2b1cca6c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java
index eda90c9d44..eda90c9d44 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
index 0391acc676..0391acc676 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
index 286f109f44..286f109f44 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
index 28f4f9fb25..28f4f9fb25 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java
index af59324c7c..af59324c7c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
index d0a42be34e..d0a42be34e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java
index 3058b1f5b6..3058b1f5b6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
index 006b80ee31..006b80ee31 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
index 38cc4a9de2..38cc4a9de2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index 70c71c5f1f..70c71c5f1f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
index 95d8e67bf7..95d8e67bf7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index ec4e17385f..ec4e17385f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
index 296677d8b8..296677d8b8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
index ee8b5274cc..ee8b5274cc 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 69c5a11e9b..69c5a11e9b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 6309cc5403..6309cc5403 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
index 10f142c67b..10f142c67b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
index ca44667903..ca44667903 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
index 7d50cd0ae4..7d50cd0ae4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 7982dc123c..7982dc123c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index f8d1e11ef3..f8d1e11ef3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index f8e4d5bbd4..f8e4d5bbd4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 381c0ba23b..381c0ba23b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint
index 45b3512614..45b3512614 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/assembly/xml/assembly-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/assembly/xml/assembly-xml-validation-messages.properties
index 8ad5f88892..8ad5f88892 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/assembly/xml/assembly-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/assembly/xml/assembly-xml-validation-messages.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties
index de27c0bd31..de27c0bd31 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/definitions/xml/definitions-xml-validation-messages.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties
index 08ef6bb5e9..08ef6bb5e9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/main/resources/org/apache/tuscany/sca/policy/xml/policy-xml-validation-messages.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessorTestCase.java
index 3f4a74ba03..3f4a74ba03 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessorTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
index 0d5e69bd61..0d5e69bd61 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index 155c0c5a47..155c0c5a47 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 473e483d31..473e483d31 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 05d320b211..05d320b211 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
index 28a2bb6851..28a2bb6851 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
index 7a36c1d97d..7a36c1d97d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index fc675dcdce..fc675dcdce 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index df588e3504..df588e3504 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index 28e679da4a..28e679da4a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StripURISpacesTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StripURISpacesTestCase.java
index 8d9bc72389..8d9bc72389 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StripURISpacesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StripURISpacesTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index b6f4c11ac2..b6f4c11ac2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
index cfec8dee7a..cfec8dee7a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index 5e3fa15b69..5e3fa15b69 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index f83a2ebd14..f83a2ebd14 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 543aaf9893..543aaf9893 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index a19ce79490..a19ce79490 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
index f50cd5811f..f50cd5811f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java
index 58e6e534b9..58e6e534b9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
index f99b81f73f..f99b81f73f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java
index a148e33029..a148e33029 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
index 4f8c608459..4f8c608459 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 231bdfd516..231bdfd516 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
index aea2c3adb8..aea2c3adb8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index be0c1eb737..be0c1eb737 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 83fa64cef4..83fa64cef4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite
index 287810b156..287810b156 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index 0d344ac937..0d344ac937 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index 5606e653bb..5606e653bb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 9140403fc4..9140403fc4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 195dfcf106..195dfcf106 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 42e6c1c3ec..42e6c1c3ec 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 424cec3e8a..424cec3e8a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index 489d6abed1..489d6abed1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 279f7d534e..279f7d534e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index 2cfbd6bcff..2cfbd6bcff 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
index dc7f5c422c..dc7f5c422c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
index 0e7aad877e..0e7aad877e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index a262b00345..a262b00345 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/LICENSE b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/LICENSE
index 0bea130c88..0bea130c88 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/LICENSE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/META-INF/MANIFEST.MF
index ff93db6b14..ff93db6b14 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/NOTICE b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/NOTICE
index c5118ba0fd..c5118ba0fd 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/NOTICE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/pom.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/pom.xml
index 77334729b9..77334729b9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
index 3e9bf490cb..3e9bf490cb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index ad8ef70c3c..ad8ef70c3c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
index e8e8f7625a..e8e8f7625a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
index 685e89a57e..685e89a57e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
index 641798b17f..641798b17f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-secext-1.0.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
index f8d74e9c6e..f8d74e9c6e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/oasis-200401-wss-wssecurity-utility-1.0.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
index f6fc9c53b0..f6fc9c53b0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
index c43e5814ed..c43e5814ed 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
index 7fb8c1beed..7fb8c1beed 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
index ac4b0ec8e6..ac4b0ec8e6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
index c4e9808cfd..c4e9808cfd 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
index 5f3c796810..5f3c796810 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
index 4bccf9d5f8..4bccf9d5f8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
index 824ba95b47..824ba95b47 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
index 50e6aa6201..50e6aa6201 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
index a337296d45..a337296d45 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
index 65e200bf8a..65e200bf8a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
index 874e36bab8..874e36bab8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
index da391a983f..da391a983f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
index a93c4c5960..a93c4c5960 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
index 98fffa201f..98fffa201f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
index 6131804edc..6131804edc 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
index ab0fce9ac8..ab0fce9ac8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
index 8f2f20db19..8f2f20db19 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
index 967dadf395..967dadf395 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
index ee4b313e6d..ee4b313e6d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
index f2780f9895..f2780f9895 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
index b54ced4e4e..b54ced4e4e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
index 2856a51450..2856a51450 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
index 5ef3e86c92..5ef3e86c92 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
index 518f0747fb..518f0747fb 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
index b07bf01f1d..b07bf01f1d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
index 7b78e13749..7b78e13749 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
index 8d3510be7d..8d3510be7d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
index 97b44f8da5..97b44f8da5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
index 61693046c1..61693046c1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
index 4505850072..4505850072 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.xsd
index 603455a1f2..603455a1f2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
index 52445c14c5..52445c14c5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
index 67feb54963..67feb54963 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
index 200f3e50a4..200f3e50a4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
index d1bdcbdfae..d1bdcbdfae 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd
index f19a0c4248..f19a0c4248 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
index ea39a773e0..ea39a773e0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.xsd
index 9857ec62b7..9857ec62b7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
index c97b91251b..c97b91251b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
index fab809c7e1..fab809c7e1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
index 491cb2abce..491cb2abce 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index 4cf8649bc6..4cf8649bc6 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/LICENSE b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/LICENSE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/META-INF/MANIFEST.MF
index 61b8b3ffea..61b8b3ffea 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/NOTICE b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/NOTICE
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/pom.xml b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/pom.xml
index 0420331be2..0420331be2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/pom.xml
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index dca1decb76..dca1decb76 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 45fa05d66c..45fa05d66c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 5d82b9b727..5d82b9b727 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index b9abb90b03..b9abb90b03 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 9b96556173..9b96556173 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index d34ec7d01f..d34ec7d01f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index efd8557e07..efd8557e07 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 1202b4d83a..1202b4d83a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index ad72780de8..ad72780de8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index e1e3eab90c..e1e3eab90c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index f748828999..f748828999 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 64a55f1b44..64a55f1b44 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index 88cb2f9a2c..88cb2f9a2c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 575d0784ce..575d0784ce 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index fcfa689a7d..fcfa689a7d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 0c57c74ec0..0c57c74ec0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 6d8350fc66..6d8350fc66 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index 43bf17d66a..43bf17d66a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index 5c2ad74f54..5c2ad74f54 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index da8d054140..da8d054140 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
index d179ce7b3b..d179ce7b3b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 3912896f0c..3912896f0c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5b719e50bc..5b719e50bc 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
index 9df72e358d..9df72e358d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index d82d923605..d82d923605 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index c65b6213b0..c65b6213b0 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 2ee3e774e4..2ee3e774e4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index aa356e3857..aa356e3857 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index feae980326..feae980326 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 1f3d412364..1f3d412364 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index 075b50eec1..075b50eec1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
index c622737454..c622737454 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 7be207cdd2..7be207cdd2 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
index 374c36c1f5..374c36c1f5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
index d432bf3f29..d432bf3f29 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 50bf10f54a..50bf10f54a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
index 6dba234f0f..6dba234f0f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
index d47c3d9032..d47c3d9032 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
index 4f2842c61a..4f2842c61a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
index 423c856973..423c856973 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java
index 2bfbe85664..2bfbe85664 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 24dc20f815..24dc20f815 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index 3e44f5f7ae..3e44f5f7ae 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 24b1a0e03e..24b1a0e03e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 0759ff1361..0759ff1361 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 516b11724f..516b11724f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
index d912606f1d..d912606f1d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index dcd6c7b08a..dcd6c7b08a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 8a03df339c..8a03df339c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index 9db522930f..9db522930f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 78b54668b3..78b54668b3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index f8c9f53413..f8c9f53413 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index b52c65ef8b..b52c65ef8b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index fba6af7e7f..fba6af7e7f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index ae5fad461b..ae5fad461b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 55b48ec578..55b48ec578 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 32377faf54..32377faf54 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 2b72f1f047..2b72f1f047 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 34ece5a24b..34ece5a24b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
index d13740b287..d13740b287 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 340fa2854c..340fa2854c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
index e69eb4a771..e69eb4a771 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 677e86c759..677e86c759 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 263af296b1..263af296b1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 69d76f238d..69d76f238d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index 84e5825b50..84e5825b50 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index b42f3f929f..b42f3f929f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 62523e5c17..62523e5c17 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index a4990f6a98..a4990f6a98 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
index 156fd0af75..156fd0af75 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
index 7a63bbedc5..7a63bbedc5 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
index 5c68c6cbff..5c68c6cbff 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
index f45be80888..f45be80888 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
index 616616ae7a..616616ae7a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
index d87d45b27a..d87d45b27a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
index 224bc0a69a..224bc0a69a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
index eb74677236..eb74677236 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java
index e05a05476a..e05a05476a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 386275b41b..386275b41b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index 4aa5f2780a..4aa5f2780a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index 179dc1755e..179dc1755e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index e3103b768a..e3103b768a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 054b18c349..054b18c349 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index d1958eb00b..d1958eb00b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
index db1d5f7fd7..db1d5f7fd7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index 392e81a8fa..392e81a8fa 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index 0cac606e1a..0cac606e1a 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index 2e82c201d9..2e82c201d9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 1757ab3c92..1757ab3c92 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 92ac0850e7..92ac0850e7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index 12ea22938c..12ea22938c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index a62813edd4..a62813edd4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 468083c839..468083c839 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index c56b5545ce..c56b5545ce 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 0acb326a47..0acb326a47 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 38e33e33d9..38e33e33d9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 334c826f86..334c826f86 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 849b922285..849b922285 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index abae4e7e38..abae4e7e38 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 2252434c39..2252434c39 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index fd1b840b17..fd1b840b17 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
index f43c428563..f43c428563 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
index f8f8a48b06..f8f8a48b06 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
index d142015f57..d142015f57 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index b2578fab49..b2578fab49 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 5b401baeb3..5b401baeb3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
index ee4f5b5236..ee4f5b5236 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java
index 6bb7244e05..6bb7244e05 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
index b7de263789..b7de263789 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index b2ac5ca409..b2ac5ca409 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index a1ae3892e4..a1ae3892e4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
index e585fcf384..e585fcf384 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
index c1862283c7..c1862283c7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 1a2a9c5bad..1a2a9c5bad 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
index 97fbc19ced..97fbc19ced 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index 5c285e4d95..5c285e4d95 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 27a77f3ba8..27a77f3ba8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index 357b7afab4..357b7afab4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
index b9f9fa5eb4..b9f9fa5eb4 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index c67ff1eab8..c67ff1eab8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 75d1229cd8..75d1229cd8 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
index 102bea8d41..102bea8d41 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
index 8a4adb3d7f..8a4adb3d7f 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 20189eae98..20189eae98 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 6e24d0bcfd..6e24d0bcfd 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
index 61171ac041..61171ac041 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
index c1cb41d967..c1cb41d967 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
index e2da378609..e2da378609 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 6ff07189e1..6ff07189e1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
index 8ded10c9db..8ded10c9db 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
index 4a62d074c7..4a62d074c7 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
index b94d37ba2d..b94d37ba2d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
index d3905035b9..d3905035b9 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 20fd74d46e..20fd74d46e 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index a09f7af06c..a09f7af06c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 6777c33ff1..6777c33ff1 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index 24be8a3e7d..24be8a3e7d 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index 603d393e5c..603d393e5c 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index d1faa5cf2b..d1faa5cf2b 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 2775c4ac71..2775c4ac71 100644
--- a/sca-java-2.x/tags/sca-java-2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java