Renaming 2.0-M5.1 releasi cadidate release tag

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

5367 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0-M5.1/BUILDING b/sca-java-2.x/tags/2.0-M5.1-RC1/BUILDING
index 1f7d52f93f..1f7d52f93f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/BUILDING
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/BUILDING
diff --git a/sca-java-2.x/tags/2.0-M5.1/CHANGES b/sca-java-2.x/tags/2.0-M5.1-RC1/CHANGES
index f8d6dcbda9..f8d6dcbda9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/CHANGES
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/CHANGES
diff --git a/sca-java-2.x/tags/2.0-M5.1/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/LICENSE
index ddd30126af..ddd30126af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/NOTICE
index 65bf34a9ba..65bf34a9ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/README b/sca-java-2.x/tags/2.0-M5.1-RC1/README
index d9eb237d6a..d9eb237d6a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/RELEASE_NOTES b/sca-java-2.x/tags/2.0-M5.1-RC1/RELEASE_NOTES
index 53ddaac3d3..53ddaac3d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/RELEASE_NOTES
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/RELEASE_NOTES
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/META-INF/MANIFEST.MF
index 1e2a0fbb4d..1e2a0fbb4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/pom.xml
index 4d6827ca5b..4d6827ca5b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
index 46c5cd6dca..46c5cd6dca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
index 69c3fb5ac9..69c3fb5ac9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
index 2787604da2..2787604da2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
index 26237c105c..26237c105c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index d705564334..d705564334 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
index 960d6a90ae..960d6a90ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
index 35970f63ca..35970f63ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-jar/src/main/resources/archetype-resources/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip-discriptor/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip-discriptor/pom.xml
index 7b14449b91..7b14449b91 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip-discriptor/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip-discriptor/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
index a672d2920d..a672d2920d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/META-INF/MANIFEST.MF
index b5be2573dd..b5be2573dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/pom.xml
index 923f9c1082..923f9c1082 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
index 46c5cd6dca..46c5cd6dca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
index c17535e802..c17535e802 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
index 6eb7061a4a..6eb7061a4a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
index 48b62dbb6f..48b62dbb6f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
index 4b25553893..4b25553893 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/java/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
index 960d6a90ae..960d6a90ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
index 3dc8175bd7..3dc8175bd7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/contribution-zip/src/main/resources/archetype-resources/src/main/resources/add.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/pom.xml
index 892ac669db..892ac669db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/pom.xml
index 1db679ba9e..1db679ba9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
index 47c2f5dc10..47c2f5dc10 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
index c466a1b3f5..c466a1b3f5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
index 9931025aba..9931025aba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index a99cc7b032..a99cc7b032 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
index 53e77c5be0..53e77c5be0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 4d3d532184..4d3d532184 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 922d275b17..922d275b17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
index 7aeaf81b33..7aeaf81b33 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-bpel/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/pom.xml
index 110094e705..110094e705 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
index f15a12fb88..f15a12fb88 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
index b5295d8a73..b5295d8a73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
index 200b8402fa..200b8402fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
index e38c84feda..e38c84feda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/myfaces/HelloWorldController.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
index d6cb7bbcf2..d6cb7bbcf2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
index ec9bfd7221..ec9bfd7221 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
index 3b732de8af..3b732de8af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 7e18dc9308..7e18dc9308 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 48b73fe68a..48b73fe68a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
index 4a3197ec4f..4a3197ec4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
index 768aa2408b..768aa2408b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/index.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
index 1c096f66c6..1c096f66c6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsf/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/pom.xml
index 88acca8ec4..88acca8ec4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
index 450e33afd5..450e33afd5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
index 1bf4353502..1bf4353502 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
index 5f90419782..5f90419782 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
index 2491816adc..2491816adc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index 3527edcd6f..3527edcd6f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index fa37fec88c..fa37fec88c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 25d8d8184d..25d8d8184d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
index 9729ca6823..9729ca6823 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-jsonp/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
index ae84237c4a..ae84237c4a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/pom.xml
index 9f0390e294..9f0390e294 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
index f15a12fb88..f15a12fb88 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
index b5295d8a73..b5295d8a73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
index 3af5934fe9..3af5934fe9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
index d6cb7bbcf2..d6cb7bbcf2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
index 390b424d24..390b424d24 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/sca/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
index 5bfa1c5d32..5bfa1c5d32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/BaseActionBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
index 05fd743841..05fd743841 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/java/stripes/action/HomeActionBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
index 6567f21ce1..6567f21ce1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/StripesResources.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
index e2fd1997c8..e2fd1997c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
index 59cdacfe23..59cdacfe23 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
index 0964d2fb7b..0964d2fb7b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index 6452b1bd9c..6452b1bd9c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index f98b7f2721..f98b7f2721 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index d73e7311d6..d73e7311d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
index a350f1e68a..a350f1e68a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart-stripes/src/main/resources/archetype-resources/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/META-INF/MANIFEST.MF
index 29e03eb396..29e03eb396 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/pom.xml
index dec6a0c504..dec6a0c504 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index c132fa0364..c132fa0364 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
index 7794570626..7794570626 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 81501d2291..81501d2291 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
index df80303778..df80303778 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
index 47501efb9a..47501efb9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
index 8d840b7867..8d840b7867 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index a7c7d2251e..a7c7d2251e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
index 9729ca6823..9729ca6823 100644
--- a/sca-java-2.x/tags/2.0-M5.1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/assembly/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/assembly/pom.xml
index 7a1e75d994..7a1e75d994 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/assembly/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/assembly/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
index 9431fee034..9431fee034 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/assembly/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/assembly/src/test/resources/oasis-sca-tests.properties
index 0d8cc27a45..0d8cc27a45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/assembly/src/test/resources/oasis-sca-tests.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/assembly/src/test/resources/oasis-sca-tests.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties
index 630361751a..630361751a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/assembly/src/test/resources/tuscany-oasis-sca-tests-errors.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-caa/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-caa/pom.xml
index 7360f28cf4..7360f28cf4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-caa/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-caa/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-caa/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-caa/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
index 136e5668c0..136e5668c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-caa/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-caa/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-caa/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-caa/src/test/resources/oasis-sca-tests.properties
index 38e1e013dc..38e1e013dc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-caa/src/test/resources/oasis-sca-tests.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-caa/src/test/resources/oasis-sca-tests.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties
index 2e0017225b..2e0017225b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-caa/src/test/resources/tuscany-oasis-sca-tests-errors.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-ci/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-ci/pom.xml
index c7d17cdd48..c7d17cdd48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-ci/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-ci/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
index 136e5668c0..136e5668c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-ci/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-ci/src/test/resources/oasis-sca-tests.properties
index 38e1e013dc..38e1e013dc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-ci/src/test/resources/oasis-sca-tests.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-ci/src/test/resources/oasis-sca-tests.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
index aebd49cef3..aebd49cef3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/policy/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/policy/pom.xml
index d4bcfa98ee..d4bcfa98ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/policy/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/policy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
index 136e5668c0..136e5668c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties
index 0d8cc27a45..0d8cc27a45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/policy/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/policy/src/test/resources/tuscany-oasis-sca-tests-errors.properties
index 8a17b24f8b..8a17b24f8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/policy/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/policy/src/test/resources/tuscany-oasis-sca-tests-errors.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/pom.xml
index 51ec0c5ad8..51ec0c5ad8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/compliance-tests/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/compliance-tests/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/axiom-api-1.2.7.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/axiom-api-1.2.7.MF
index 3a692b6c06..3a692b6c06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/axiom-api-1.2.7.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/axiom-api-1.2.7.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/axiom-api-1.2.8.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/axiom-api-1.2.8.MF
index 671a7bff34..671a7bff34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/axiom-api-1.2.8.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/axiom-api-1.2.8.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/axis2-kernel-1.5.1.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/axis2-kernel-1.5.1.MF
index 686e53ae0b..686e53ae0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/axis2-kernel-1.5.1.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/axis2-kernel-1.5.1.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/axis2-transport-http-1.5.1.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/axis2-transport-http-1.5.1.MF
index ae6448acf5..ae6448acf5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/axis2-transport-http-1.5.1.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/axis2-transport-http-1.5.1.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/woden-impl-dom-1.0M8.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/woden-impl-dom-1.0M8.MF
index b3e9d79d28..b3e9d79d28 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/manifests/woden-impl-dom-1.0M8.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/manifests/woden-impl-dom-1.0M8.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/pom.xml
index d6926210b0..d6926210b0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/assembly/bin-default.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/assembly/bin-default.xml
index c946a0925a..c946a0925a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/assembly/bin-default.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/assembly/bin-default.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/assembly/bin-distribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/assembly/bin-distribution.xml
index 59b7c14719..59b7c14719 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/assembly/bin-distribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/assembly/bin-distribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/assembly/src.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/assembly/src.xml
index 4badbac903..4badbac903 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/assembly/src.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/assembly/src.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-common.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-common.xml
index b5b7111096..b5b7111096 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-common.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-common.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-launcher.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-launcher.xml
index 4afd92b098..4afd92b098 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-launcher.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-launcher.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-lib.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-lib.xml
index 1da6bebbe6..1da6bebbe6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-lib.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-lib.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-modules.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-modules.xml
index 15233db587..15233db587 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-modules.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-modules.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-samples.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-samples.xml
index 1c1bc5abfd..1c1bc5abfd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-samples.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-samples.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-tracing.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-tracing.xml
index d80fdf42f0..d80fdf42f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/components/bin-tracing.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/components/bin-tracing.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/bin/INSTALL b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/bin/INSTALL
index c7af84fc2f..c7af84fc2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/bin/INSTALL
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/bin/INSTALL
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/bin/LICENSE
index 78b21411e2..78b21411e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/bin/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/bin/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/bin/NOTICE
index 65bf34a9ba..65bf34a9ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/bin/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/bin/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/bin/README b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/bin/README
index 7db5d694c2..7db5d694c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/bin/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/bin/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/README b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/README
index d651dfdeb7..d651dfdeb7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/default.config b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/default.config
index d0f68de133..d0f68de133 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/default.config
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/default.config
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/osgi.config b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/osgi.config
index 9516b9db34..9516b9db34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/osgi.config
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/osgi.config
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/tuscany.bat b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/tuscany.bat
index cbf6962218..cbf6962218 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/tuscany.bat
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/tuscany.bat
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/tuscany.sh b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/tuscany.sh
index b053afe4e1..b053afe4e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/tuscany.sh
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/tuscany.sh
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/unmanaged.config b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/unmanaged.config
index ac99590ce9..ac99590ce9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/all/src/main/release/launcher/unmanaged.config
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/all/src/main/release/launcher/unmanaged.config
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/pom.xml
index a7b51af77d..a7b51af77d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/README.txt b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/README.txt
index b6158e3667..b6158e3667 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/README.txt
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/README.txt
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/pom.xml
index ac3920c9f8..ac3920c9f8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/download-tomcat/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/download-tomcat/pom.xml
index 3d1a8cd5a3..3d1a8cd5a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/download-tomcat/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/download-tomcat/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
index 9a3e6fd8f1..9a3e6fd8f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java
index 0be22979c2..0be22979c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/java/testing/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
index d6db86cf64..d6db86cf64 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml
index 411d8a3146..411d8a3146 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp
index d520375993..d520375993 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-client-webapp/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
index 419a6f7425..419a6f7425 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldRefImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldRefImpl.java
index c2d0bcb4dc..c2d0bcb4dc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldRefImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldRefImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldService.java
index b035a772be..b035a772be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/java/testing/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/META-INF/sca-contribution.xml
index 693325c13d..693325c13d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/helloworld.composite
index b07cf6078c..b07cf6078c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-reference-contribution/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
index 7238252046..7238252046 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/java/testing/HelloworldService.java
index b035a772be..b035a772be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/java/testing/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/java/testing/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/META-INF/sca-contribution.xml
index 7839933b3a..7839933b3a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/WEB-INF/web.xml
index f2e3441d5e..f2e3441d5e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp
index 45ae96cb82..45ae96cb82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-jsp/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
index f6dc4fb40c..f6dc4fb40c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldService.java
index b035a772be..b035a772be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java
index 5be51fab61..5be51fab61 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/java/testing/HelloworldServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/META-INF/sca-contribution.xml
index 7839933b3a..7839933b3a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/WEB-INF/web.xml
index d424d4b71b..d424d4b71b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/hello.html
index 5398cb5274..5398cb5274 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-scaclient-servlet/src/main/webapp/hello.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
index bd6b259c8f..bd6b259c8f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java
index 564b2e332f..564b2e332f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java
index eec9d63da8..eec9d63da8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/java/testing/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
index 4e0eca6068..4e0eca6068 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
index 82b2cc7ce7..82b2cc7ce7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/helloworld-service-contribution/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/legal-checks/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/legal-checks/pom.xml
index 3d1625a0c4..3d1625a0c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/legal-checks/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/legal-checks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 05f16f603d..05f16f603d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/pom.xml
index 17280a75aa..17280a75aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/testing/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/testing/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF
index 70e18a0c9a..70e18a0c9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/NOTICE
index 0d2bd8fb3e..0d2bd8fb3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/pom.xml
index 4e98c1a7d8..4e98c1a7d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java
index 54947d6492..54947d6492 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyAnnotationsProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyContextConfig.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyContextConfig.java
index 5e7905d246..5e7905d246 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyContextConfig.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyContextConfig.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyHostConfig.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyHostConfig.java
index e92d7a0bf6..e92d7a0bf6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyHostConfig.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyHostConfig.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java
index a9eee9687e..a9eee9687e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyLifecycleListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
index ca9c81f1c3..ca9c81f1c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-hook/src/main/java/org/apache/tuscany/sca/tomcat/TuscanyStandardContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF
index 0b0e3e7d0d..0b0e3e7d0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-servlet/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-servlet/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-servlet/pom.xml
index aad3b7d612..aad3b7d612 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-servlet/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-servlet/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java
index 59fecbf8f7..59fecbf8f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/Installer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java
index efcc2711f3..efcc2711f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-servlet/src/main/java/org/apache/tuscany/sca/war/InstallerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/pom.xml
index 3caa0a9b4f..3caa0a9b4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/assembly/war.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
index 5c6dff5915..5c6dff5915 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
index f4f88da9ac..f4f88da9ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE
index cdc221ee60..cdc221ee60 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/webapp/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
index e6c3d23e9e..e6c3d23e9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp
index 68fd5101b3..68fd5101b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/distribution/tomcat/tomcat-war/src/main/webapp/installer.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/all/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/all/pom.xml
index a20988eb06..a20988eb06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/all/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/all/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/api/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/api/pom.xml
index 8037d00700..8037d00700 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/binding-ws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/binding-ws/pom.xml
index a7ed6c62aa..a7ed6c62aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/binding-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/binding-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/core/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/core/pom.xml
index 9987e7f8d0..9987e7f8d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/core/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/core/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/ejava/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/ejava/pom.xml
index 78872d2ec8..78872d2ec8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/ejava/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/ejava/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/osgi/pom.xml
index dfd7413794..dfd7413794 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/pom.xml
index 26ff5af9ac..26ff5af9ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/process/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/process/pom.xml
index 3c8c49ca47..3c8c49ca47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/process/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/process/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/sdo/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/sdo/pom.xml
index a450a8d6e8..a450a8d6e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/sdo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/sdo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/web20/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/web20/pom.xml
index 0af8dc31d4..0af8dc31d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/web20/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/web20/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/webapp/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/webapp/pom.xml
index f21d34dc48..f21d34dc48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/features/webservice/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/features/webservice/pom.xml
index f1320d7492..f1320d7492 100644
--- a/sca-java-2.x/tags/2.0-M5.1/features/webservice/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/features/webservice/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/pom.xml
index ea7442f299..ea7442f299 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java
index 5bb860ef89..5bb860ef89 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/src/test/resources/sample-store-all.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/src/test/resources/sample-store-all.jar
index 6f3649ff23..6f3649ff23 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/src/test/resources/sample-store-all.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/src/test/resources/sample-store-all.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/src/test/resources/sample-store-client.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/src/test/resources/sample-store-client.jar
index 5dfecda310..5dfecda310 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/src/test/resources/sample-store-client.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/src/test/resources/sample-store-client.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/src/test/resources/sample-store.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/src/test/resources/sample-store.jar
index 98e1f6ebb4..98e1f6ebb4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/T3558/src/test/resources/sample-store.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/T3558/src/test/resources/sample-store.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/base/dependencies/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/base/dependencies/pom.xml
index 80db4f4789..80db4f4789 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/base/dependencies/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/base/dependencies/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
index 6e69506417..6e69506417 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/base/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/base/pom.xml
index e368e8442f..e368e8442f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/base/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/base/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/pom.xml
index 0c5c468566..0c5c468566 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
index d7dff093f9..d7dff093f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
index 5ecf5494be..5ecf5494be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
index 24ab0a4181..24ab0a4181 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
index f46893481b..f46893481b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
index a687534bb2..a687534bb2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
index a9268ac1b5..a9268ac1b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
index d3cfb80547..d3cfb80547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
index b976a53970..b976a53970 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
index c0317687df..c0317687df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
index ef66d28bb9..ef66d28bb9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
index 541a713112..541a713112 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
index 4e13380e0b..4e13380e0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-reference/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/pom.xml
index cc18763445..cc18763445 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
index 315591fb98..315591fb98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
index e606e6dd52..e606e6dd52 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld-ws/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/pom.xml
index 55cb3f8726..55cb3f8726 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
index 0999e97065..0999e97065 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
index 86e6e4e9c5..86e6e4e9c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
index 156e32e9ee..156e32e9ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
index 96ec8b24b7..96ec8b24b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
index c77318e8fd..c77318e8fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/resources/log4j.properties
index 37f66e4189..37f66e4189 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/helloworld/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/helloworld/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/pom.xml
index f42b1ac828..f42b1ac828 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/pom.xml
index 0f21269de8..0f21269de8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
index b0dc7a6389..b0dc7a6389 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
index bf73a64027..bf73a64027 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
index 6f36b1c55a..6f36b1c55a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
index 8c5c5de208..8c5c5de208 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
index f4b8d2cf39..f4b8d2cf39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
index 299f7606e3..299f7606e3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
index 7fabed9436..7fabed9436 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario1/scenario1.composite
index 286e53539f..286e53539f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario1/scenario1.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario1/scenario1.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario1/scenario1a.composite
index 2bdfc19c3c..2bdfc19c3c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario1/scenario1a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario1/scenario1a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
index ac01b3c687..ac01b3c687 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario10/scenario10.composite
index 2d127a7bec..2d127a7bec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario10/scenario10.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario10/scenario10.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario10/scenario10a.composite
index 0fda11482b..0fda11482b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario10/scenario10a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario10/scenario10a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario10/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario10/service3.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario10/service3.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
index 8b82b43c68..8b82b43c68 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario11/scenario11.composite
index 2f5ca96d07..2f5ca96d07 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario11/scenario11.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario11/scenario11.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario11/scenario11a.composite
index 1831d97ea7..1831d97ea7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario11/scenario11a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario11/scenario11a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario11/service3.wsdl
index 2477e23dc6..2477e23dc6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario11/service3.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario11/service3.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
index 4028098023..4028098023 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario12/scenario12.composite
index 23799f8487..23799f8487 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario12/scenario12.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario12/scenario12.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario12/scenario12a.composite
index 7982a9b2d7..7982a9b2d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario12/scenario12a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario12/scenario12a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
index 1da59d5f04..1da59d5f04 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario13/scenario13.composite
index 631e38855f..631e38855f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario13/scenario13.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario13/scenario13.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario13/scenario13a.composite
index a6e31ea5e2..a6e31ea5e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario13/scenario13a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario13/scenario13a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
index b51ef11b05..b51ef11b05 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario2/scenario2.composite
index 2fa559e1ed..2fa559e1ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario2/scenario2.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario2/scenario2.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario2/scenario2a.composite
index 9fd3df07e8..9fd3df07e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario2/scenario2a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario2/scenario2a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
index 22950dfe03..22950dfe03 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario3/scenario3.composite
index 84f42c60fc..84f42c60fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario3/scenario3.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario3/scenario3.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario3/scenario3a.composite
index 89fa0619e4..89fa0619e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario3/scenario3a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario3/scenario3a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
index a17e27c9d8..a17e27c9d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario4/scenario4.composite
index a0bdb0197d..a0bdb0197d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario4/scenario4.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario4/scenario4.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario4/scenario4a.composite
index fbf1b1a893..fbf1b1a893 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario4/scenario4a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario4/scenario4a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
index 83a232db6e..83a232db6e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario5/scenario5.composite
index 2326afd2f2..2326afd2f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario5/scenario5.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario5/scenario5.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario5/scenario5a.composite
index 802d82b0f3..802d82b0f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario5/scenario5a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario5/scenario5a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario5/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario5/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario5/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
index fb477d3e62..fb477d3e62 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario6/scenario6.composite
index dadfc7eb82..dadfc7eb82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario6/scenario6.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario6/scenario6.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario6/scenario6a.composite
index 0c94b2bf06..0c94b2bf06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario6/scenario6a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario6/scenario6a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario6/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario6/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario6/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
index ede31d6bee..ede31d6bee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario7/scenario7.composite
index e1d2e0cefe..e1d2e0cefe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario7/scenario7.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario7/scenario7.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario7/scenario7a.composite
index 76892f1515..76892f1515 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario7/scenario7a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario7/scenario7a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario7/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario7/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario7/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
index 7bb9e694a3..7bb9e694a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario8/scenario8.composite
index 467b7f57fa..467b7f57fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario8/scenario8.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario8/scenario8.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario8/scenario8a.composite
index 86cf093f94..86cf093f94 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario8/scenario8a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario8/scenario8a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario8/scenarios.wsdl
index 5cda7327dd..5cda7327dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario8/scenarios.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario8/scenarios.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
index b6ec160506..b6ec160506 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario9/scenario9.composite
index 83584ed482..83584ed482 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario9/scenario9.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario9/scenario9.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario9/scenario9a.composite
index 2861974c98..2861974c98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/main/resources/scenario9/scenario9a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/main/resources/scenario9/scenario9a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
index 6d41581371..6d41581371 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
index 897cd21e8a..897cd21e8a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
index c5eb7a70ea..c5eb7a70ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/pom.xml
index 5dad1d4a1e..5dad1d4a1e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index b013462f9f..b013462f9f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 252e4dc45f..252e4dc45f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
index d883dc2d6f..d883dc2d6f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index afb7c45e2c..afb7c45e2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 44f57b4316..44f57b4316 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/resources/CallBackApiTest.composite
index a67233665c..a67233665c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/resources/CallBackApiTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
index b1a01e9f7b..b1a01e9f7b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
index 75fab95efb..75fab95efb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/pom.xml
index 0cea4677b2..0cea4677b2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
index 5e77ac2b91..5e77ac2b91 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
index d36d7478e2..d36d7478e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 43b812faed..43b812faed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/pom.xml
index c1f8432fe0..c1f8432fe0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
index 5339e9952e..5339e9952e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
index d36d7478e2..d36d7478e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
index 43b812faed..43b812faed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/pom.xml
index 90521d7862..90521d7862 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 627d37e27d..627d37e27d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 966ad17b9a..966ad17b9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index d2dc0add75..d2dc0add75 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index 32ab1bdd3e..32ab1bdd3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index f7a1a195ed..f7a1a195ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
index 9730c294d6..9730c294d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
index 11e748675d..11e748675d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
index dde489d766..dde489d766 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/pom.xml
index 90de670490..90de670490 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
index 7c80d222fc..7c80d222fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
index c3ea6c3032..c3ea6c3032 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
index 84ca158c97..84ca158c97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
index 66758a1e73..66758a1e73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
index f198efae51..f198efae51 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
index 2b484293c7..2b484293c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
index 9fe62ac671..9fe62ac671 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
index bd3cce74b4..bd3cce74b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/pom.xml
index 5d5a0e3e1c..5d5a0e3e1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
index dc66003604..dc66003604 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index f03144db8a..f03144db8a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
index 137ea6a658..137ea6a658 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
index 4bf05fc925..4bf05fc925 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
index bec98a49c9..bec98a49c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
index b10f3bc771..b10f3bc771 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
index c216cab1be..c216cab1be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/pom.xml
index 4e533b7a46..4e533b7a46 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/resources/CallBackReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/resources/CallBackReference.composite
index 477ef7391f..477ef7391f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/resources/CallBackReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/resources/CallBackReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/resources/CallBackService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/resources/CallBackService.composite
index c3f0f5bc81..c3f0f5bc81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/resources/CallBackService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/resources/CallBackService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml
index 11d737e701..11d737e701 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java
index 92fc8f4bef..92fc8f4bef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/pom.xml
index 6799067a34..6799067a34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 291a72b9d6..291a72b9d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 19f366c423..19f366c423 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 4bb6b29a8d..4bb6b29a8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index 5396879e83..5396879e83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 07010f61e1..07010f61e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/resources/CallBackReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/resources/CallBackReference.composite
index 477ef7391f..477ef7391f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/resources/CallBackReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/resources/CallBackReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/resources/CallBackService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/resources/CallBackService.composite
index c3f0f5bc81..c3f0f5bc81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/resources/CallBackService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/resources/CallBackService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml
index efef032b8f..efef032b8f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
index 19e818b68f..19e818b68f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/pom.xml
index b2185e305c..b2185e305c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/CalculatorClient.java
index 6f978bd9be..6f978bd9be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
index 1209ac128a..1209ac128a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/Calculator.composite
index fc08333544..fc08333544 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
index a6babbfc2f..a6babbfc2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
index b3a4ac83e9..b3a4ac83e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
index 9238359f76..9238359f76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
index 2fadb54bf1..2fadb54bf1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
index 6ca2df2928..6ca2df2928 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
index ac3ccc3d08..ac3ccc3d08 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/pom.xml
index 02a570c067..02a570c067 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
index b4c677b371..b4c677b371 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
index ef2a43c766..ef2a43c766 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
index fe264693fe..fe264693fe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
index d5dfb647d3..d5dfb647d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository3/contribution.zip
index b293aa4bcc..b293aa4bcc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-folder/src/test/resources/repository3/contribution.zip
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-folder/src/test/resources/repository3/contribution.zip
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/pom.xml
index 775011627a..775011627a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
index 669821261c..669821261c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
index ff9f6e75f3..ff9f6e75f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
index bea6f39932..bea6f39932 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
index aeeab337fa..aeeab337fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
index 44614f243a..44614f243a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-java/pom.xml
index 8cb47f7b0f..8cb47f7b0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
index 7e11adcec7..7e11adcec7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
index 5a14b41650..5a14b41650 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-resource/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-resource/pom.xml
index d8133c4acc..d8133c4acc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-resource/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-resource/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
index f11eacb416..f11eacb416 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
index 1ff281373a..1ff281373a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-wsdl/pom.xml
index 831441fb7e..831441fb7e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
index 8254b667f2..8254b667f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
index 0172fb2c7c..0172fb2c7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/pom.xml
index 86036a9577..86036a9577 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
index c062afaed0..c062afaed0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
index 130aa91093..130aa91093 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
index 0172fb2c7c..0172fb2c7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
index d49e2ead99..d49e2ead99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
index 44ceba1240..44ceba1240 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
index 3cc6784eca..3cc6784eca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/pom.xml
index a1a52ab5cc..a1a52ab5cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
index 224e2c4d79..224e2c4d79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
index a53117e72f..a53117e72f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 9bc94525e0..9bc94525e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-resource/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-resource/pom.xml
index e35feddf80..e35feddf80 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-resource/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-resource/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
index ac6d7becb3..ac6d7becb3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
index bb5a7b764f..bb5a7b764f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-resource/src/main/resources/store.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
index 1b7542b7d9..1b7542b7d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/pom.xml
index 43a9cc27e7..43a9cc27e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
index e03ed4dc25..e03ed4dc25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
index a47b9a71e9..a47b9a71e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
index 76ccf71fb8..76ccf71fb8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
index 66227eacaa..66227eacaa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/pom.xml
index a586565252..a586565252 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-import-export/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-import-export/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-zip/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-zip/pom.xml
index 838f3cbd0e..838f3cbd0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-zip/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-zip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-zip/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
index b4c677b371..b4c677b371 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-zip/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
index 303e2a6d9a..303e2a6d9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-zip/src/test/resources/repository/contribution.zip b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-zip/src/test/resources/repository/contribution.zip
index 25476c2206..25476c2206 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/contribution-zip/src/test/resources/repository/contribution.zip
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/contribution-zip/src/test/resources/repository/contribution.zip
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/pom.xml
index a965d2feff..a965d2feff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
index 6c362b0062..6c362b0062 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
index da4644057e..da4644057e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
index 4b58fab1f0..4b58fab1f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
index 3d3efb9c29..3d3efb9c29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
index 0190df2d1c..0190df2d1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
index af2c9ea711..af2c9ea711 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
index bd1ce8cb49..bd1ce8cb49 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
index 3639ba812d..3639ba812d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
index abcec43d0e..abcec43d0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
index 171a7919a2..171a7919a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
index 5f2dc56033..5f2dc56033 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
index 24a628d406..24a628d406 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
index da37f28e39..da37f28e39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
index 7b2466f791..7b2466f791 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
index 27052a1549..27052a1549 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
index 57daa51f42..57daa51f42 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
index 88fef0b4fb..88fef0b4fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
index c5d2aab203..c5d2aab203 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
index db57fc5cba..db57fc5cba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
index ec25e703c5..ec25e703c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
index 940b391499..940b391499 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
index 63a11dc56a..63a11dc56a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
index 8c0bfc9e39..8c0bfc9e39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
index 72ff55a711..72ff55a711 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
index 8a063b8b9d..8a063b8b9d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
index bc42d57ac3..bc42d57ac3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
index 1cb1ed295e..1cb1ed295e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
index e2221541c5..e2221541c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
index 13f294b871..13f294b871 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
index 66cc1d1e82..66cc1d1e82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
index f14394b400..f14394b400 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
index 56388624d7..56388624d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
index 1897d0682c..1897d0682c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
index c8c88ef91d..c8c88ef91d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
index 5540b98c21..5540b98c21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
index 648144299c..648144299c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
index b57e098a56..b57e098a56 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
index 8ddfa10575..8ddfa10575 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
index 9717629711..9717629711 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
index 1247b4618d..1247b4618d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
index f2cc3adad5..f2cc3adad5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
index dbad550222..dbad550222 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
index d29129236c..d29129236c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
index 837ba04cea..837ba04cea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
index 0b24056642..0b24056642 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
index e2ed1ab037..e2ed1ab037 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
index 46888399ed..46888399ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
index c276038050..c276038050 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
index 079a56b446..079a56b446 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
index 0407184598..0407184598 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
index 16e099cfa3..16e099cfa3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
index b4883cb35c..b4883cb35c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
index c96fb61204..c96fb61204 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
index 3427c127ec..3427c127ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
index 78464fe40d..78464fe40d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
index faff36c2a4..faff36c2a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
index 750006cec6..750006cec6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
index ef9f561d1b..ef9f561d1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
index 1bc2156183..1bc2156183 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
index a198eaf646..a198eaf646 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
index dc752a2aea..dc752a2aea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
index aa2f06909b..aa2f06909b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
index c7569720f0..c7569720f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
index bc76373633..bc76373633 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
index 2f10177bd0..2f10177bd0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
index de8624455f..de8624455f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
index 1813de4e67..1813de4e67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
index 9b49adbfbb..9b49adbfbb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
index 7889a80bf1..7889a80bf1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
index cdd49904d3..cdd49904d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
index 6f0ef584da..6f0ef584da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
index 71003d008f..71003d008f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
index 271f1e669b..271f1e669b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
index f2baffce9a..f2baffce9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
index 1b44da9752..1b44da9752 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
index 8270ba1a8c..8270ba1a8c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
index 922759cd8d..922759cd8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
index ac7b0af175..ac7b0af175 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
index 47f0775c16..47f0775c16 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
index 0e894cb7ea..0e894cb7ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
index 13bc1d499e..13bc1d499e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
index 8e76958e31..8e76958e31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
index 1e4264256b..1e4264256b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
index 12b0f404ae..12b0f404ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
index b679214c6c..b679214c6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
index 415634c80f..415634c80f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
index 937d82b33e..937d82b33e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
index cb868d18a0..cb868d18a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 3e77527d73..3e77527d73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioFive.composite
index b3675a0194..b3675a0194 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioFive.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioFive.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioFour.composite
index 50bfc02803..50bfc02803 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioFour.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioFour.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioOne.composite
index 495ca2a41f..495ca2a41f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioOne.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioOne.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioSix.composite
index 840cd076b1..840cd076b1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioSix.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioSix.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioThree.composite
index f02ba89496..f02ba89496 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioThree.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioThree.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioTwo.composite
index ed3f545f72..ed3f545f72 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/ScenarioTwo.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/ScenarioTwo.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/itest_scenario.idl
index 41489a4565..41489a4565 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/itest_scenario.idl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/itest_scenario.idl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/scenariofour.xsd
index 2669b54be3..2669b54be3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/corba/src/test/resources/scenariofour.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/corba/src/test/resources/scenariofour.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/pom.xml
index 8727afc7a2..8727afc7a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
index 5d389643cc..5d389643cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
index 52f1c01fd8..52f1c01fd8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
index f1c948dc1c..f1c948dc1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
index 4a4419a42b..4a4419a42b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
index 65f019ec48..65f019ec48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
index 45c01dc054..45c01dc054 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
index 4e0bd38b2b..4e0bd38b2b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
index 40aff31297..40aff31297 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
index ca012b967d..ca012b967d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
index be446c9759..be446c9759 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
index 3bae554dc7..3bae554dc7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
index a31cc3d45a..a31cc3d45a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
index df9e6e53ec..df9e6e53ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
index 779943739e..779943739e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
index 6239c0f5f1..6239c0f5f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index 690a2adb3d..690a2adb3d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3bdf886dfa..3bdf886dfa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
index 0fdf69459f..0fdf69459f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 3b9690b7d2..3b9690b7d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 351d9df0cb..351d9df0cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
index 2f3bd3f2cb..2f3bd3f2cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
index 078be8896e..078be8896e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
index 4d451e6d32..4d451e6d32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
index d520e64881..d520e64881 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
index 460f6dd1a4..460f6dd1a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
index 858b8da59a..858b8da59a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
index 6c7c82a4ba..6c7c82a4ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
index 44b6e9d906..44b6e9d906 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
index e0b81152ad..e0b81152ad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
index eea19521c4..eea19521c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index 263d1212ca..263d1212ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index 182ccf0f83..182ccf0f83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
index 3ceee3c4b1..3ceee3c4b1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 6aefb05c83..6aefb05c83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 4e40f006d6..4e40f006d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 68510b4b03..68510b4b03 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
index 10a242be4d..10a242be4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
index 0b5dacda35..0b5dacda35 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
index c38ee6ee78..c38ee6ee78 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
index db01ba12ba..db01ba12ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
index 09d42b2bdf..09d42b2bdf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
index 5aefe799a6..5aefe799a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
index 8bacf13063..8bacf13063 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
index 6aac75ae08..6aac75ae08 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
index 755619908d..755619908d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
index 8ece2c3293..8ece2c3293 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index dd9a689353..dd9a689353 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/pom.xml
index 5e1f1d68d8..5e1f1d68d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
index ab2d9630eb..ab2d9630eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
index 7bd95cec95..7bd95cec95 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index ac6c8d5a60..ac6c8d5a60 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3a5a81bae4..3a5a81bae4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 1f3b7ec633..1f3b7ec633 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 0c073cd054..0c073cd054 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
index 61449c8981..61449c8981 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
index 690001bfe1..690001bfe1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index e55d2527f4..e55d2527f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index 60ff4163d0..60ff4163d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index b3d3c3eb3a..b3d3c3eb3a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 1fa525a0ee..1fa525a0ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 9d851455da..9d851455da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
index 4041e848d1..4041e848d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
index f62689c8b8..f62689c8b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
index 432c3115bd..432c3115bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
index 9b08c334cc..9b08c334cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
index f9ac98d5bc..f9ac98d5bc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
index 219497e2c1..219497e2c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index 3351e9c441..3351e9c441 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index 8430d5e978..8430d5e978 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index 7499978c0e..7499978c0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/pom.xml
index c84092046a..c84092046a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/databindings/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/databindings/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/bin-distro-unzip/build.xml
index 6c4b1fdf3f..6c4b1fdf3f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/bin-distro-unzip/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/bin-distro-unzip/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/bin-distro-unzip/pom.xml
index 751915ab07..751915ab07 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/bin-distro-unzip/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/bin-distro-unzip/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-rmi-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-rmi-calculator/build.xml
index 86afb7a952..86afb7a952 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-rmi-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-rmi-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-rmi-calculator/pom.xml
index 157bacec4f..157bacec4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-rmi-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-rmi-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-sca-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-sca-calculator/build.xml
index bd5f247a19..bd5f247a19 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-sca-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-sca-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-sca-calculator/pom.xml
index a726e7d49a..a726e7d49a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-sca-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-sca-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-ws-calculator/build.xml
index de8ea977a9..de8ea977a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-ws-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-ws-calculator/pom.xml
index c75ec0fa80..c75ec0fa80 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-binding-ws-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-implementation-java-calculator/build.xml
index 52704f49f1..52704f49f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-implementation-java-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-implementation-java-calculator/pom.xml
index 04def5c96c..04def5c96c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/contribution-implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/contribution-implementation-java-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/launcher-embedded-jse/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/launcher-embedded-jse/build.xml
index cd569b380a..cd569b380a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/launcher-embedded-jse/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/launcher-embedded-jse/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/launcher-embedded-jse/pom.xml
index 386bb3aadf..386bb3aadf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/launcher-embedded-jse/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/launcher-embedded-jse/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/launcher-embedded-osgi/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/launcher-embedded-osgi/build.xml
index c6874ed86e..c6874ed86e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/launcher-embedded-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/launcher-embedded-osgi/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/launcher-embedded-osgi/pom.xml
index 1d90b779e3..1d90b779e3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/launcher-embedded-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/launcher-embedded-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/legal-checks/pom.xml
index cbe2fd19d4..cbe2fd19d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/legal-checks/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/legal-checks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
index 3564128c8d..3564128c8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/pom.xml
index 1c115ebacd..1c115ebacd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/distribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/distribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/distributed/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/distributed/pom.xml
index d323016a90..d323016a90 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/distributed/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/distributed/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/distributed/src/test/java/itest/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/distributed/src/test/java/itest/Helloworld.java
index f764bc8358..f764bc8358 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/distributed/src/test/java/itest/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/distributed/src/test/java/itest/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java
index 222b3e8c3a..222b3e8c3a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/helloworld/pom.xml
index 41751ac0f9..41751ac0f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
index 2a10b3fb77..2a10b3fb77 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
index 8939a73d01..8939a73d01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/helloworld/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/helloworld/src/main/resources/helloworld.composite
index 18d064c588..18d064c588 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/helloworld/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/helloworld/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/interfaces/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/interfaces/pom.xml
index b9a4405873..b9a4405873 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/interfaces/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/interfaces/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/interfaces/src/main/java/itest/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/interfaces/src/main/java/itest/Helloworld.java
index f764bc8358..f764bc8358 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/interfaces/src/main/java/itest/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/interfaces/src/main/java/itest/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/pom.xml
index a86c371579..a86c371579 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/standalone/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/standalone/pom.xml
index 971fc8f86c..971fc8f86c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/standalone/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/standalone/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
index 0fbcc98a96..0fbcc98a96 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/pom.xml
index 4574e274eb..4574e274eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
index c307547f56..c307547f56 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
index 064d615c45..064d615c45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/test/EndpointsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/test/EndpointsTestCase.java
index 7802848c3b..7802848c3b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/test/EndpointsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/test/EndpointsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
index f3b6c15bf1..f3b6c15bf1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/test/Utils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/test/Utils.java
index 5107d8f660..5107d8f660 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/java/test/Utils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/java/test/Utils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/resources/helloworld.composite
index 1f56c3d73b..1f56c3d73b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/resources/nested.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/resources/nested.composite
index 138020eab0..138020eab0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/endpoints/src/test/resources/nested.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/endpoints/src/test/resources/nested.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/pom.xml
index e2478a57c2..e2478a57c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
index 1f57116bac..1f57116bac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 112aefc747..112aefc747 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
index 53a6c70b57..53a6c70b57 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index ace219991b..ace219991b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
index 453528444d..453528444d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
index 26b9f0a383..26b9f0a383 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
index cd62338841..cd62338841 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
index 56b9fc6f5b..56b9fc6f5b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
index c5b54ff902..c5b54ff902 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/resources/ExceptionTest.composite
index b8a8b01e8b..b8a8b01e8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/main/resources/ExceptionTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/main/resources/ExceptionTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
index 7794348476..7794348476 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/pom.xml
index 7f79cd8af6..7f79cd8af6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
index bd7770ca7d..bd7770ca7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
index 747433a9e7..747433a9e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
index eae607a7ca..eae607a7ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
index b033516c1b..b033516c1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
index 4f063993a3..4f063993a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
index b3ef6e7312..b3ef6e7312 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
index 595626e672..595626e672 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
index 968d420fc8..968d420fc8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
index 8bb3006d12..8bb3006d12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
index f68134702b..f68134702b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
index 78b3649b5b..78b3649b5b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestBean.java
index 1a0abd7f8f..1a0abd7f8f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
index e3d9a36bb8..e3d9a36bb8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
index 47342fded8..47342fded8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestReference.java
index 6f5b280f31..6f5b280f31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
index dea7933e1a..dea7933e1a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
index b80b05dc08..b80b05dc08 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
index 544b39ad58..544b39ad58 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
index 81d59432b8..81d59432b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
index f5514bad0a..f5514bad0a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
index 27df510da8..27df510da8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
index c50f0ef4d9..c50f0ef4d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
index a0bb10e8dd..a0bb10e8dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
index 5973484f6e..5973484f6e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
index 9267f28e83..9267f28e83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
index 5b1885d6b3..5b1885d6b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
index dcc88f6770..dcc88f6770 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
index 0e7cb86633..0e7cb86633 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
index 0238f0b013..0238f0b013 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
index 5ffeda11df..5ffeda11df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
index 5c44e023dd..5c44e023dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
index c50f0ef4d9..c50f0ef4d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
index e889d84544..e889d84544 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
index 950dbeba4c..950dbeba4c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
index 8613e6c82a..8613e6c82a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
index b7281272da..b7281272da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
index 504d59e5ff..504d59e5ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
index 9912624870..9912624870 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
index 62e4e077b6..62e4e077b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
index e9f8bb888b..e9f8bb888b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
index 30719684a9..30719684a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
index 1705164104..1705164104 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
index 539dfa6e32..539dfa6e32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
index fcbafad27d..fcbafad27d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
index 4204b75b48..4204b75b48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
index 42e0cdbd23..42e0cdbd23 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
index 83558e8abc..83558e8abc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
index c9bb5b9e3e..c9bb5b9e3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
index 856b41f897..856b41f897 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
index b59114bd31..b59114bd31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
index 4a873f2424..4a873f2424 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
index a346e290b9..a346e290b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
index 2602839d1d..2602839d1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
index c029b06a8c..c029b06a8c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
index 8df60c5bab..8df60c5bab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
index f5261c85bb..f5261c85bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
index 83875e0b0a..83875e0b0a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
index 19892597c1..19892597c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
index a44ae38d24..a44ae38d24 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
index d54f0544d8..d54f0544d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
index 71768f5a7b..71768f5a7b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
index 0c6f8d2e84..0c6f8d2e84 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
index 53cc094aca..53cc094aca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
index 5869d344f6..5869d344f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
index 90d26dd89f..90d26dd89f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
index f28dace31a..f28dace31a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
index def30b3ea0..def30b3ea0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
index fa7967c964..fa7967c964 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
index b57cc7f366..b57cc7f366 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
index 0c2e1daa81..0c2e1daa81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
index 8d0c548899..8d0c548899 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
index f4bd53876c..f4bd53876c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
index 0907985d7f..0907985d7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
index c2dfbf247f..c2dfbf247f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
index 5db9c84c00..5db9c84c00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/exports/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/exports/pom.xml
index 2e0f69a92c..2e0f69a92c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/exports/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/exports/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java
index 186e42da39..186e42da39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml
index 9a0edcba68..9a0edcba68 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/imports/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/imports/pom.xml
index 4a383e08d4..4a383e08d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/imports/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/imports/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java
index 4c7bc92b4f..4c7bc92b4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/imports/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/imports/src/main/resources/Helloworld.composite
index b4e2ff8868..b4e2ff8868 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/imports/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/imports/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml
index c136923ab4..c136923ab4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/pom.xml
index 2aaa6e3295..2aaa6e3295 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/tests/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/tests/pom.xml
index acaa06010b..acaa06010b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/tests/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/tests/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java
index f55edb6077..f55edb6077 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/pom.xml
index a4fe8c0525..a4fe8c0525 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index f4131593d5..f4131593d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
index 5fc9ed51b3..5fc9ed51b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
index 6cd937af12..6cd937af12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
index 05a9d09bdd..05a9d09bdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
index ab0b18191c..ab0b18191c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
index 724d94dffb..724d94dffb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index be3fa4c15a..be3fa4c15a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
index 9f34dfd274..9f34dfd274 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
index 541b1f1508..541b1f1508 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
index b29b298ab6..b29b298ab6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
index 00a0f5645b..00a0f5645b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite
index da5700aa35..da5700aa35 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite
index e9267b75d3..e9267b75d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
index d7ceeda6b6..d7ceeda6b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
index 5aa8be2f04..5aa8be2f04 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/pom.xml
index aa7722cd40..aa7722cd40 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
index 4e55bae98d..4e55bae98d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
index 0bf3328c31..0bf3328c31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
index a43b85361b..a43b85361b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
index b15ab6be08..b15ab6be08 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
index b30367319d..b30367319d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
index 548b7a9da5..548b7a9da5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
index eb72924093..eb72924093 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/pom.xml
index cced9df86b..cced9df86b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
index e1c2bedea3..e1c2bedea3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/src/test/java/stock/StockQuote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/src/test/java/stock/StockQuote.java
index 74e25bb3bd..74e25bb3bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/src/test/java/stock/StockQuote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/src/test/java/stock/StockQuote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/src/test/java/stock/StockQuoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
index 516c63d864..516c63d864 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/src/test/java/stock/StockQuoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/src/test/resources/StockQuote.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/src/test/resources/StockQuote.composite
index c8c7719dfa..c8c7719dfa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jaxws/src/test/resources/StockQuote.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jaxws/src/test/resources/StockQuote.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/pom.xml
index 9d2c82912b..9d2c82912b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
index ce6a9514af..ce6a9514af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
index 7f9ed9612f..7f9ed9612f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
index 33364f61c0..33364f61c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
index 3bf4e0bc30..3bf4e0bc30 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/pom.xml
index 0aeebe93fb..0aeebe93fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 68506b857b..68506b857b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 5f19aa1fa5..5f19aa1fa5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 18324d5d1d..18324d5d1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
index ac6e94ca21..ac6e94ca21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/resources/jndi.properties
index 7ce468aa0f..7ce468aa0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/resources/selectors/selectors.composite
index 827d3a7dc8..827d3a7dc8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/main/resources/selectors/selectors.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 28e0b530c1..28e0b530c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/pom.xml
index 68857e4d56..68857e4d56 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
index f90db55dda..f90db55dda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
index b78feab413..b78feab413 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
index 20b74ccc1a..20b74ccc1a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
index cec4e6fa6d..cec4e6fa6d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
index 68c3bfa4e0..68c3bfa4e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/resources/jndi.properties
index be362c51cc..be362c51cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/resources/simple/client.composite
index 671fddaa34..671fddaa34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/resources/simple/tempq.composite
index e140bdf9b7..e140bdf9b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/main/resources/simple/tempq.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/main/resources/simple/tempq.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
index 1661a4614c..1661a4614c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
index 5897df6784..5897df6784 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/pom.xml
index 47afd0e956..47afd0e956 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
index f4da034c55..f4da034c55 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/resources/defaults/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/resources/defaults/client.composite
index 06010956aa..06010956aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/resources/defaults/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/resources/defaults/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/resources/defaults/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/resources/defaults/service.composite
index 5354afb130..5354afb130 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/resources/defaults/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/resources/defaults/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
index d2b1a5fe59..d2b1a5fe59 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/pom.xml
index 5edeadae0e..5edeadae0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 6b763874df..6b763874df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
index a57e5befe2..a57e5befe2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/resources/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/resources/definitions.xml
index 07b9f4aaa8..07b9f4aaa8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/resources/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/resources/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/resources/definitions/definitions.composite
index 6e478e067d..6e478e067d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/resources/definitions/definitions.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/resources/definitions/definitions.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/resources/jndi.properties
index d7f64fda62..d7f64fda62 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
index 729ad072b7..729ad072b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/pom.xml
index 491edd30bc..491edd30bc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 9e4c4c46d4..9e4c4c46d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
index 865bb39b4c..865bb39b4c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/resources/exceptions/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/resources/exceptions/service.composite
index 42e33330d7..42e33330d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/resources/exceptions/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/resources/jndi.properties
index 72d5457faf..72d5457faf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index a1a6c4aae0..a1a6c4aae0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/pom.xml
index f3e67df7e5..f3e67df7e5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
index 469882f3b3..469882f3b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
index 19b584950a..19b584950a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
index b12e3a562e..b12e3a562e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
index b23db73c01..b23db73c01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
index 9e4c4c46d4..9e4c4c46d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
index 02426936d2..02426936d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
index 866acf1ce1..866acf1ce1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
index 53504398bf..53504398bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/resources/exceptions/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
index 162d7d68b8..162d7d68b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/resources/exceptions/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/resources/exceptions/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
index dce41b86ac..dce41b86ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/resources/exceptions/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
index 0d897d8703..0d897d8703 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/pom.xml
index 9ccbeb9b94..9ccbeb9b94 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
index 5883e9a2d8..5883e9a2d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/resources/external/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/resources/external/client.composite
index a872a75160..a872a75160 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/resources/external/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/resources/external/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/resources/external/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/resources/external/service.composite
index a22b04ec86..a22b04ec86 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/resources/external/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/resources/external/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
index b8cbde7b26..b8cbde7b26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/pom.xml
index e047667384..e047667384 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
index cdd079810e..cdd079810e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
index 49cb0a69ab..49cb0a69ab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/pom.xml
index 557e293555..557e293555 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 1684c19c50..1684c19c50 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index cc7b7b11e4..cc7b7b11e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 3742bd6ac6..3742bd6ac6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index eae95b4201..eae95b4201 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index a37a03d994..a37a03d994 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
index f74ab86a14..f74ab86a14 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
index 53498ce44d..53498ce44d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/pom.xml
index 91b3280afa..91b3280afa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index 530eac3d00..530eac3d00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 1768816247..1768816247 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index d0a5faaef7..d0a5faaef7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 204863423d..204863423d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index b143079fe3..b143079fe3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index b62d1b1f1d..b62d1b1f1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
index 96fa9abce5..96fa9abce5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
index 78c0239f0d..78c0239f0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/pom.xml
index bdbafd3f9b..bdbafd3f9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 490bd5d4a3..490bd5d4a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 5aed6b12d7..5aed6b12d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index efe2f1a4dc..efe2f1a4dc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index c1011ce6fb..c1011ce6fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index d863b3a0a3..d863b3a0a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 0f7a730b91..0f7a730b91 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
index 48608ba9b3..48608ba9b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
index f72ce434fa..f72ce434fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
index f47031da10..f47031da10 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/pom.xml
index 4532859afe..4532859afe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index a1c38f7295..a1c38f7295 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 3b34dbae85..3b34dbae85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index 443d2aa746..443d2aa746 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index b179a86f52..b179a86f52 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index fa9e9eb1cb..fa9e9eb1cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 29233d74a9..29233d74a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
index aa81e59b52..aa81e59b52 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
index 4625f46578..4625f46578 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
index a2bfc0ca8a..a2bfc0ca8a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/pom.xml
index 44dc585411..44dc585411 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index 57ad23e064..57ad23e064 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index ea8d5ffd28..ea8d5ffd28 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index afcd391009..afcd391009 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index 8af585c13c..8af585c13c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 4f0a6fe4c5..4f0a6fe4c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index a8dd686725..a8dd686725 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
index a9e8782f94..a9e8782f94 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
index b887aa18fd..b887aa18fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/pom.xml
index b7994d4364..b7994d4364 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index 5e9a7a316e..5e9a7a316e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index 768b293380..768b293380 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 2bac5db5ab..2bac5db5ab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index be2af78958..be2af78958 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e85d4ca5a4..e85d4ca5a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 175b482c81..175b482c81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
index c15d99550e..c15d99550e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
index 53db66ea7e..53db66ea7e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
index 6054050a5d..6054050a5d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
index f28d7bdb02..f28d7bdb02 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
index 1acbfbd5ae..1acbfbd5ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
index 2d19d4bd82..2d19d4bd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
index 3ccd54e9bd..3ccd54e9bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
index b9a1ffd5ef..b9a1ffd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
index b92959cfd3..b92959cfd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
index ff5cf617f2..ff5cf617f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
index 1684c19c50..1684c19c50 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
index cc7b7b11e4..cc7b7b11e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
index 3742bd6ac6..3742bd6ac6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
index eae95b4201..eae95b4201 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
index a37a03d994..a37a03d994 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
index 530eac3d00..530eac3d00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
index 1768816247..1768816247 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
index d0a5faaef7..d0a5faaef7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
index 204863423d..204863423d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
index b143079fe3..b143079fe3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
index b62d1b1f1d..b62d1b1f1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
index 490bd5d4a3..490bd5d4a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
index 5aed6b12d7..5aed6b12d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
index efe2f1a4dc..efe2f1a4dc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
index c1011ce6fb..c1011ce6fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
index d863b3a0a3..d863b3a0a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
index 0f7a730b91..0f7a730b91 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
index a1c38f7295..a1c38f7295 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
index 3b34dbae85..3b34dbae85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
index 443d2aa746..443d2aa746 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
index b179a86f52..b179a86f52 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
index fa9e9eb1cb..fa9e9eb1cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
index 29233d74a9..29233d74a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
index 57ad23e064..57ad23e064 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
index ea8d5ffd28..ea8d5ffd28 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
index afcd391009..afcd391009 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
index 8af585c13c..8af585c13c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
index 4f0a6fe4c5..4f0a6fe4c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
index a8dd686725..a8dd686725 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
index 5e9a7a316e..5e9a7a316e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
index 768b293380..768b293380 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
index 2bac5db5ab..2bac5db5ab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
index be2af78958..be2af78958 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
index e85d4ca5a4..e85d4ca5a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
index 175b482c81..175b482c81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
index 7bb33ae270..7bb33ae270 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
index 9f955c278a..9f955c278a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
index 7c1cce6087..7c1cce6087 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
index 3d41f656f9..3d41f656f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
index ced023ecdd..ced023ecdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
index 79dd18b027..79dd18b027 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
index 935a2e73c5..935a2e73c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
index 8fc3d77cb3..8fc3d77cb3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/pom.xml
index e0a9252670..e0a9252670 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9083ba1d9c..9083ba1d9c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 3149f99a25..3149f99a25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
index decff8708f..decff8708f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
index 16474865ce..16474865ce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
index 54cfdeb273..54cfdeb273 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/pom.xml
index 764297e644..764297e644 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
index 16825fe48f..16825fe48f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/resources/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/resources/service.composite
index a712990a9b..a712990a9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/main/resources/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/main/resources/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
index 848e340181..848e340181 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/pom.xml
index c1551badfa..c1551badfa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 7fed36fa77..7fed36fa77 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 7ab6019fd5..7ab6019fd5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
index 89758becff..89758becff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
index ccb52c8702..ccb52c8702 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/resources/jndi.properties
index 7ce468aa0f..7ce468aa0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/resources/nulls.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/resources/nulls.composite
index 64fc9f9345..64fc9f9345 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/main/resources/nulls.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/main/resources/nulls.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
index ac872f46a6..ac872f46a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/pom.xml
index 9e025fff4c..9e025fff4c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
index edd6d508f7..edd6d508f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/resources/jndi.properties
index 8934614a8a..8934614a8a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
index bf709776df..bf709776df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
index da2e6a2264..da2e6a2264 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 5d1f764382..5d1f764382 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/pom.xml
index be81046ba0..be81046ba0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
index 9083ba1d9c..9083ba1d9c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
index 3149f99a25..3149f99a25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
index edd6d508f7..edd6d508f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
index 8bccf22bea..8bccf22bea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
index 0014b88050..0014b88050 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index 14bbf238e1..14bbf238e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/pom.xml
index 5f448e58a3..5f448e58a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
index 7e417723f2..7e417723f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
index 12c7313bb4..12c7313bb4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
index c6ea015d85..c6ea015d85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
index ebffbc4bc4..ebffbc4bc4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/pom.xml
index ae32c263a9..ae32c263a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/pom.xml
index 74e3a8d384..74e3a8d384 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
index d4cd5df431..d4cd5df431 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
index 464072b42d..464072b42d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
index 4140fa0b89..4140fa0b89 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
index 2be4f2ad3e..2be4f2ad3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
index d5684ca56c..d5684ca56c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
index e18de0456c..e18de0456c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
index 12c7313bb4..12c7313bb4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/resources/properties/properties.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/resources/properties/properties.composite
index 12c26132a2..12c26132a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/main/resources/properties/properties.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/main/resources/properties/properties.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
index e8d748bb19..e8d748bb19 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/pom.xml
index 2b341055e7..2b341055e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
index 23c5979291..23c5979291 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/resources/cf/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/resources/cf/client.composite
index a3e5403432..a3e5403432 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/resources/cf/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/resources/cf/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/resources/cf/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/resources/cf/service.composite
index cd04ae7836..cd04ae7836 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/resources/cf/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/resources/cf/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/resources/jndi.properties
index a41e42950e..a41e42950e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
index 03b834ce7d..03b834ce7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/pom.xml
index 218e6931f9..218e6931f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
index 23c5979291..23c5979291 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/resources/simple/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/resources/simple/client.composite
index a758389e89..a758389e89 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/resources/simple/service.composite
index 33364f61c0..33364f61c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
index 3c0eb0791b..3c0eb0791b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/pom.xml
index a9faf03fd1..a9faf03fd1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index b589d5e8bc..b589d5e8bc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
index 1aff0d454e..1aff0d454e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
index fb53c877e6..fb53c877e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
index 1bbaf5d6f4..1bbaf5d6f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
index 4bdc4edcb5..4bdc4edcb5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
index 0592194b21..0592194b21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
index 2d4ff0192b..2d4ff0192b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
index b632b3f60f..b632b3f60f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
index b2df9137c8..b2df9137c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
index 0b24678543..0b24678543 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
index 0ce66005fc..0ce66005fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
index 7e42113da4..7e42113da4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
index 724de6ff7c..724de6ff7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
index 3527e98032..3527e98032 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
index c18534c128..c18534c128 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
index 6b86764820..6b86764820 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/jndi.properties
index 7ce468aa0f..7ce468aa0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/selectors/selectors.composite
index 651cbe81a4..651cbe81a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/main/resources/selectors/selectors.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/main/resources/selectors/selectors.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
index bee0c549bd..bee0c549bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
index 33e047ae18..33e047ae18 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
index e7254005be..e7254005be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/pom.xml
index 99cdd17c73..99cdd17c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index b572b1012a..b572b1012a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 9cec2d9b3e..9cec2d9b3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
index 0036391696..0036391696 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
index c1156b35e6..c1156b35e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/resources/jndi.properties
index d7988ee60d..d7988ee60d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/resources/topics/TopicsClient.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
index d4027ff60d..d4027ff60d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/resources/topics/TopicsService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/resources/topics/TopicsService.composite
index 8726543253..8726543253 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/main/resources/topics/TopicsService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/main/resources/topics/TopicsService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
index 35fe96b81a..35fe96b81a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/pom.xml
index 9a50ba574e..9a50ba574e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
index 336fecf67b..336fecf67b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
index dc6577b7e1..dc6577b7e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 4f9908f062..4f9908f062 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
index ff50ad2daa..ff50ad2daa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/resources/jndi.properties
index 7ac9aa559c..7ac9aa559c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/resources/ttl.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/resources/ttl.composite
index 8b06a9fc7c..8b06a9fc7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/main/resources/ttl.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/main/resources/ttl.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
index b5839f4c4f..b5839f4c4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/pom.xml
index 9c02cd44d9..9c02cd44d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index 9aef6ba1a3..9aef6ba1a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index 430c71aaef..430c71aaef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index 2c6d9d0d17..2c6d9d0d17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
index 655372580c..655372580c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/resources/jndi.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/resources/jndi.properties
index 4d6acc037b..4d6acc037b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/resources/jndi.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/resources/jndi.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/resources/simple/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/resources/simple/service.composite
index 33364f61c0..33364f61c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
index 2e47288c04..2e47288c04 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
index 60b0f0a1a3..60b0f0a1a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/pom.xml
index 184398aeb0..184398aeb0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index e3fcdfd25f..e3fcdfd25f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 8232acb658..8232acb658 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index 5728ad2e07..5728ad2e07 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index 5cc40ca77f..5cc40ca77f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite
index 32ec5f0e2f..32ec5f0e2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/pom.xml
index a20035c609..a20035c609 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
index ef2565b750..ef2565b750 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
index 96a0f2dadd..96a0f2dadd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
index f2b7b1e41d..f2b7b1e41d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
index a6e80c9eca..a6e80c9eca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
index 0fe30c9d53..0fe30c9d53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
index 8783808334..8783808334 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
index 050d35007b..050d35007b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
index 6c432a500a..6c432a500a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
index 3573eea978..3573eea978 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
index b04cc33023..b04cc33023 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
index fe282d291c..fe282d291c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 9efa1a99ec..9efa1a99ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index efa84e92a5..efa84e92a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 45d28140b4..45d28140b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index a5d6529895..a5d6529895 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index f7ab3dfe98..f7ab3dfe98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index 3d25d37708..3d25d37708 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index a469d197d6..a469d197d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index 3f5a21fddd..3f5a21fddd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 49e5232b31..49e5232b31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index ccc77c142b..ccc77c142b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index c2be798d1a..c2be798d1a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 9355aece1f..9355aece1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index efc47aa94d..efc47aa94d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index 6ed813ff0a..6ed813ff0a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index ba70573efb..ba70573efb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index a87d6eb49a..a87d6eb49a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 3dc0b12b82..3dc0b12b82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index b15d6dea80..b15d6dea80 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index c4347b084a..c4347b084a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 846bff02e1..846bff02e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index d69f442879..d69f442879 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
index cbcc06056a..cbcc06056a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
index dccd2dace8..dccd2dace8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
index 7aac95a8ff..7aac95a8ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
index f748beb6cb..f748beb6cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
index 7c4cf4b0b7..7c4cf4b0b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
index 017acee582..017acee582 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index 86f984e61a..86f984e61a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
index 8e19fd7382..8e19fd7382 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
index b0d623e2e4..b0d623e2e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
index ccb44694d9..ccb44694d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
index 5c8bb13f43..5c8bb13f43 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 1ff1792bb7..1ff1792bb7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index b17d8e2016..b17d8e2016 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
index e230326f5f..e230326f5f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
index 77df8c2c39..77df8c2c39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
index 8effa3ac36..8effa3ac36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 2467ddab88..2467ddab88 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index d1b75d0a2c..d1b75d0a2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
index 44e7efc668..44e7efc668 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 88440de023..88440de023 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
index 06dc2c3f79..06dc2c3f79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
index fcd0d39162..fcd0d39162 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
index 7255697d4b..7255697d4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
index 51fafae32c..51fafae32c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
index b8ff0c58ba..b8ff0c58ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
index 633e1a767c..633e1a767c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
index 1cba2b57c2..1cba2b57c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
index c0960ffe95..c0960ffe95 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
index 8c825ca805..8c825ca805 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
index 79b1a5d794..79b1a5d794 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
index e8924d2728..e8924d2728 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
index 4edc8df5cd..4edc8df5cd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
index 823cab4f56..823cab4f56 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
index 088fd616f4..088fd616f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
index 454e9c55cf..454e9c55cf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
index a313fb8f68..a313fb8f68 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
index 4151749523..4151749523 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
index 37af7625ff..37af7625ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
index e797a0aa9c..e797a0aa9c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
index 079ee49380..079ee49380 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
index 1d5630f3d0..1d5630f3d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
index ded3766d49..ded3766d49 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
index 4513f21acf..4513f21acf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
index 22c20ff94a..22c20ff94a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
index e6a7d776c9..e6a7d776c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
index 0393280625..0393280625 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
index f4d2789ff7..f4d2789ff7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
index 7e6311a22d..7e6311a22d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/pom.xml
index 61c2eebd82..61c2eebd82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
index ef2565b750..ef2565b750 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
index 96a0f2dadd..96a0f2dadd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
index f2b7b1e41d..f2b7b1e41d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
index a6e80c9eca..a6e80c9eca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
index 0fe30c9d53..0fe30c9d53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
index 8783808334..8783808334 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
index 050d35007b..050d35007b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
index 6c432a500a..6c432a500a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
index 3573eea978..3573eea978 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
index b04cc33023..b04cc33023 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
index fe282d291c..fe282d291c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
index 9efa1a99ec..9efa1a99ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
index efa84e92a5..efa84e92a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
index 45d28140b4..45d28140b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
index a5d6529895..a5d6529895 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
index f7ab3dfe98..f7ab3dfe98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
index 3d25d37708..3d25d37708 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index a469d197d6..a469d197d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
index 3f5a21fddd..3f5a21fddd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
index 49e5232b31..49e5232b31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
index ccc77c142b..ccc77c142b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
index c2be798d1a..c2be798d1a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 9355aece1f..9355aece1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index efc47aa94d..efc47aa94d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
index 6ed813ff0a..6ed813ff0a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
index ba70573efb..ba70573efb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
index a87d6eb49a..a87d6eb49a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 3dc0b12b82..3dc0b12b82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index b15d6dea80..b15d6dea80 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
index c4347b084a..c4347b084a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 846bff02e1..846bff02e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
index d69f442879..d69f442879 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
index cbcc06056a..cbcc06056a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
index dccd2dace8..dccd2dace8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
index 7aac95a8ff..7aac95a8ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
index f748beb6cb..f748beb6cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
index 7c4cf4b0b7..7c4cf4b0b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
index 017acee582..017acee582 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index 86f984e61a..86f984e61a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
index 8e19fd7382..8e19fd7382 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
index b0d623e2e4..b0d623e2e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
index ccb44694d9..ccb44694d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
index 5c8bb13f43..5c8bb13f43 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 1ff1792bb7..1ff1792bb7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index b17d8e2016..b17d8e2016 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
index e230326f5f..e230326f5f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
index 77df8c2c39..77df8c2c39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
index 8effa3ac36..8effa3ac36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 2467ddab88..2467ddab88 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index d1b75d0a2c..d1b75d0a2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
index 44e7efc668..44e7efc668 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 88440de023..88440de023 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
index 06dc2c3f79..06dc2c3f79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
index 05a8c3455c..05a8c3455c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
index 7255697d4b..7255697d4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
index 51fafae32c..51fafae32c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
index b8ff0c58ba..b8ff0c58ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
index 633e1a767c..633e1a767c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
index 1cba2b57c2..1cba2b57c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
index c0960ffe95..c0960ffe95 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite
index 8c825ca805..8c825ca805 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite
index 79b1a5d794..79b1a5d794 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite
index e8924d2728..e8924d2728 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite
index 4edc8df5cd..4edc8df5cd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite
index 823cab4f56..823cab4f56 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
index 54fb359ba0..54fb359ba0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite
index 454e9c55cf..454e9c55cf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
index a313fb8f68..a313fb8f68 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite
index 4151749523..4151749523 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite
index 37af7625ff..37af7625ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
index ab75f7d225..ab75f7d225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite
index e797a0aa9c..e797a0aa9c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite
index 079ee49380..079ee49380 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite
index 1d5630f3d0..1d5630f3d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite
index ded3766d49..ded3766d49 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite
index 4513f21acf..4513f21acf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
index 22c20ff94a..22c20ff94a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite
index e6a7d776c9..e6a7d776c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite
index 0393280625..0393280625 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite
index f4d2789ff7..f4d2789ff7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite
index 7e6311a22d..7e6311a22d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
index e6ccae5c73..e6ccae5c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-client/pom.xml
index a3475f20f9..a3475f20f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
index 2619dc269b..2619dc269b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
index 7e062cc14e..7e062cc14e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
index 3c4ed03448..3c4ed03448 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-iface/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-iface/pom.xml
index 43752f289f..43752f289f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-iface/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-iface/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
index a0710281c9..a0710281c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-a/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-a/pom.xml
index fb53b713c7..fb53b713c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-a/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-a/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java
index 2619dc269b..2619dc269b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml
index bba92e6ca3..bba92e6ca3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
index 55122d2d6c..55122d2d6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/pom.xml
index 17088842c7..17088842c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java
index 1cb9b813f2..1cb9b813f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java
index d64536a998..d64536a998 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java
index 728804b08c..728804b08c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml
index 555824a94e..555824a94e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite
index 38ac479275..38ac479275 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-b/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-b/pom.xml
index 2ad336cae9..2ad336cae9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-b/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-b/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java
index b1d5a8235a..b1d5a8235a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml
index 4405cca18e..4405cca18e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
index 02cff882a7..02cff882a7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-c/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-c/pom.xml
index 84500ba200..84500ba200 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-c/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-c/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java
index 81f7e1747d..81f7e1747d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml
index 3ff86f946b..3ff86f946b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
index d88db09b43..d88db09b43 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service/pom.xml
index 6c4645403a..6c4645403a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
index a27e752fd7..a27e752fd7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
index 829ece9f7c..829ece9f7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
index 5334caeb55..5334caeb55 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast-client/pom.xml
index 93da6de040..93da6de040 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
index cf99c970db..cf99c970db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/pom.xml
index 4d9a6c51ec..4d9a6c51ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
index 3755d0b365..3755d0b365 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
index 1c6b2ce754..1c6b2ce754 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
index 558afda077..558afda077 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
index 841621964f..841621964f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-tribes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-tribes/pom.xml
index 64afddc61f..64afddc61f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-tribes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-tribes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
index e55e8f63e4..e55e8f63e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
index 2d920c340a..2d920c340a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
index 888b4df156..888b4df156 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm/pom.xml
index b19f8dc61f..b19f8dc61f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
index 1c6b2ce754..1c6b2ce754 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
index 558afda077..558afda077 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-node-test/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-node-test/pom.xml
index ecd9a63e8c..ecd9a63e8c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-node-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-node-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
index 6d49b718ef..6d49b718ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/pom.xml
index 7e818822d7..7e818822d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/build.xml
index 3d77230541..3d77230541 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/client.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/client.xml
index 8e7c744940..8e7c744940 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/client.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/client.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/pom.xml
index 94728a2c93..94728a2c93 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/server.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/server.xml
index dc18cc8ce0..dc18cc8ce0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/server.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/server.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/service-a-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
index b6ec744c66..b6ec744c66 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/service-a-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/service-b-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
index d557a31b64..d557a31b64 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/service-b-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/service-c-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
index ba642c5ed0..ba642c5ed0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/service-c-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java
index 6ef30fe43f..6ef30fe43f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java
index 67a8e5d92e..67a8e5d92e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java
index d716b5cd98..d716b5cd98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/pom.xml
index a2fcc48210..a2fcc48210 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
index 6da4c1f7e1..6da4c1f7e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
index 4b034d89e0..4b034d89e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
index 998492734b..998492734b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
index 7dfa6e66cc..7dfa6e66cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
index 80c36e5ee9..80c36e5ee9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/build.xml
index ad0476c6d1..ad0476c6d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml
index 00b4a92ff8..00b4a92ff8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/client.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
index ce15b95141..ce15b95141 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/client.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
index 010a0849df..010a0849df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml
index c9f253280a..c9f253280a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/server-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/server-config.xml
index 841471f95f..841471f95f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/server-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/server-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/server.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
index ab76a35a36..ab76a35a36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/server.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
index 5d884921fd..5d884921fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
index 81af1c6b5b..81af1c6b5b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
index 0c9659b0ef..0c9659b0ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/build.xml
index fa7e963e87..fa7e963e87 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/client-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/client-config.xml
index 9942dd55a0..9942dd55a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/client-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/client-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/client.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/client.xml
index 8e7c744940..8e7c744940 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/client.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/client.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/pom.xml
index 61598467e9..61598467e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/server-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/server-config.xml
index 590cf3bddb..590cf3bddb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/server-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/server-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/server.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/server.xml
index 05a5aa16e9..05a5aa16e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/server.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/server.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
index 4973f6ca29..4973f6ca29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
index 7323c2c122..7323c2c122 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/build.xml
index fe8064e641..fe8064e641 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/pom.xml
index cd30750cf8..cd30750cf8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
index ecd239d5fb..ecd239d5fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
index ba74b67d31..ba74b67d31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
index 8ed3c3d638..8ed3c3d638 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
index ef88c22baa..ef88c22baa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
index b375944bbd..b375944bbd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
index 1f771ea4ce..1f771ea4ce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/pom.xml
index 42b4b5018c..42b4b5018c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 1f589b44f4..1f589b44f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
index a30d3611fb..a30d3611fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
index 9ec60eb78f..9ec60eb78f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/main/resources/OperationOverload.composite
index cbf5aa2078..cbf5aa2078 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/main/resources/OperationOverload.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/main/resources/OperationOverload.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
index 62e5c14ce2..62e5c14ce2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/pom.xml
index 53752cfb10..53752cfb10 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
index fd33be01d6..fd33be01d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
index 368179dc29..368179dc29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
index 05ea341466..05ea341466 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
index c9f50d08ee..c9f50d08ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
index cc7c555aff..cc7c555aff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
index 01cc8ac636..01cc8ac636 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
index 943720451f..943720451f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
index b712b99388..b712b99388 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/Customer.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/Customer.composite
index 7c66c741f6..7c66c741f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/Customer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/Customer.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/LoggingMessages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/LoggingMessages.properties
index ada808be0e..ada808be0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/LoggingMessages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/LoggingMessages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/META-INF/definitions.xml
index f64f10ca62..f64f10ca62 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/META-INF/sca-contribution.xml
index d5d1840754..d5d1840754 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/Payment.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/Payment.composite
index 20124467b0..20124467b0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/main/resources/Payment.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/main/resources/Payment.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
index 3385ee9071..3385ee9071 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/pom.xml
index 94f3d8a271..94f3d8a271 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/main/java/customer/Customer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/main/java/customer/Customer.java
index b58547bf47..b58547bf47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/main/java/customer/Customer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/main/java/customer/Customer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java
index 4a05f0d0a8..4a05f0d0a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java
index d2d6aa1f44..d2d6aa1f44 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/main/resources/Customer.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/main/resources/Customer.composite
index 7047de3663..7047de3663 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/main/resources/Customer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/main/resources/Customer.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
index 2d83cd0ee5..2d83cd0ee5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/pom.xml
index d2684c4c35..d2684c4c35 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java
index 16db3fd9fc..16db3fd9fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java
index d34591713b..d34591713b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java
index 31a2d2cb89..31a2d2cb89 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml
index 6ae1c88c42..6ae1c88c42 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 45b6be47b7..45b6be47b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
index 1d1f2131bb..1d1f2131bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite
index f5c05c2de6..f5c05c2de6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java
index 762194afbf..762194afbf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/pom.xml
index 3a3d6e0809..3a3d6e0809 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/pom.xml
index 6c9d364a77..6c9d364a77 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java
index a9835199d0..a9835199d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java
index 620adad638..620adad638 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java
index b7955522f8..b7955522f8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties
index ada808be0e..ada808be0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 961fdeb602..961fdeb602 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
index 425f511273..425f511273 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite
index 5a3a8f09a8..5a3a8f09a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
index 4d6921f8a1..4d6921f8a1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/pom.xml
index 64f102cb44..64f102cb44 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/pom.xml
index cdd2efbe73..cdd2efbe73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
index b0fd64c9da..b0fd64c9da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
index 7b44ef02e4..7b44ef02e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
index e8c4341cf2..e8c4341cf2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
index 68ce5a3cb6..68ce5a3cb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
index c8d0d4cae4..c8d0d4cae4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
index b727935bc1..b727935bc1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
index e402131ce2..e402131ce2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
index 52f9871d1b..52f9871d1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
index fceda9d9ae..fceda9d9ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
index 1642ab55f5..1642ab55f5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
index acd1f26670..acd1f26670 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
index 71dce41efc..71dce41efc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
index 9c7e8c3447..9c7e8c3447 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
index 64ca749e9f..64ca749e9f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
index a57ccd90c8..a57ccd90c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
index c147a2affe..c147a2affe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
index f44fed7389..f44fed7389 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
index 1d2e563095..1d2e563095 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
index 54082e297a..54082e297a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
index 15fb49ea4e..15fb49ea4e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
index 0a1d4a34a3..0a1d4a34a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/test/jaxb/props/package-info.java
index 6a6fdd00cc..6a6fdd00cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/java/test/jaxb/props/package-info.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/java/test/jaxb/props/package-info.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
index e697cedd62..e697cedd62 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/ConstructorPropertyInjection.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/Outer.composite
index 93f164a1e7..93f164a1e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/Outer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/Outer.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/OuterPropertyTest.composite
index 0c8714cbe1..0c8714cbe1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/OuterPropertyTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/OuterPropertyTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/PropertyTest.composite
index 7c834d5e0b..7c834d5e0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/PropertyTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/PropertyTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/customer.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/customer.xsd
index 7421750f1b..7421750f1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/customer.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/customer.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/fileProperty.txt
index 7e932622ce..7e932622ce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/fileProperty.txt
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/fileProperty.txt
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/foo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/foo.xsd
index 6831f66cec..6831f66cec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/foo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/foo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/manyValuesFileProperty.txt
index e037537d7d..e037537d7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/manyValuesFileProperty.txt
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/manyValuesFileProperty.txt
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/mySimpleService.composite
index 347990cca8..347990cca8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/mySimpleService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/mySimpleService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/rcProps.txt b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/rcProps.txt
index 052c291fd0..052c291fd0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/rcProps.txt
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/rcProps.txt
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/rcprops.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/rcprops.xsd
index 21289fa7b2..21289fa7b2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/main/resources/rcprops.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/main/resources/rcprops.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
index efc635c72b..efc635c72b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
index 0906a45ab3..0906a45ab3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
index eb217600db..eb217600db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
index a0213ced46..a0213ced46 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/pom.xml
index db6bf72f1d..db6bf72f1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
index 986c8305dd..986c8305dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
index 6cad998042..6cad998042 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
index 261eff2584..261eff2584 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
index f3c9280f96..f3c9280f96 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
index 146b8b4543..146b8b4543 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
index cf8506b4e7..cf8506b4e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
index 7386404e71..7386404e71 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
index b9b4e3ba7c..b9b4e3ba7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/pom.xml
index 02316dfd80..02316dfd80 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/policy/Target.java
index 2366f6542a..2366f6542a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/policy/Target.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/policy/Target.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
index b2d59e925c..b2d59e925c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
index 6f52dfb26e..6f52dfb26e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/Composer.java
index 18486115ae..18486115ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/Composer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/Composer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
index 13c306d9b1..13c306d9b1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/ComposerClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
index 3c432bc26a..3c432bc26a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
index 8b77484922..8b77484922 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
index a123160d85..a123160d85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/java/recursive/ComposerServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/Client.composite
index 50cbaa5086..50cbaa5086 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/Client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/Client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/Inner.composite
index df7130ba99..df7130ba99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/Inner.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/Inner.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/Outer.composite
index 1c7d49f1c0..1c7d49f1c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/Outer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/Outer.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
index cb6e0cc358..cb6e0cc358 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
index 3f76efb11b..3f76efb11b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
index 3e78eb4533..3e78eb4533 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
index 6e686a579f..6e686a579f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/policy/definitions.xml
index 923e1ad5f6..923e1ad5f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/main/resources/policy/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/main/resources/policy/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
index a1b3eb3afa..a1b3eb3afa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
index 821a437d12..821a437d12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
index 3852947223..3852947223 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
index 6ceeb3e3eb..6ceeb3e3eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/pom.xml
index 25222b39e7..25222b39e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
index f8c0850118..f8c0850118 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
index cd0aad3eea..cd0aad3eea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
index 785920bb2d..785920bb2d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
index 211e6160f6..211e6160f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
index 47a1f9bde8..47a1f9bde8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
index d436c28adc..d436c28adc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
index a1823e1cdc..a1823e1cdc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
index 80617bdec2..80617bdec2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
index d181ac96ca..d181ac96ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 14899fce62..14899fce62 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/resources/AutoWiredReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/resources/InnerReferencesTest.composite
index 7048eaf371..7048eaf371 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/resources/InnerReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index dbf72f67b6..dbf72f67b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/main/resources/ManualWiredReferencesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index 76264d308f..76264d308f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index 6e4212fd9a..6e4212fd9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
index 2fce95401e..2fce95401e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/samples/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/samples/helloworld/pom.xml
index 495f82c381..495f82c381 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/samples/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/samples/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java
index 38dc80bed3..38dc80bed3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
index dd46d68547..dd46d68547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
index 37950f1276..37950f1276 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/pom.xml
index c3c20d261c..c3c20d261c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
index 7793bdd544..7793bdd544 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
index 2d5ae6a57c..2d5ae6a57c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
index 56e127b539..56e127b539 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
index 8bf162dfd9..8bf162dfd9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/META-INF/MANIFEST.MF
index ae6704f97d..ae6704f97d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/pom.xml
index ea4ab07954..ea4ab07954 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java
index 3eecc59439..3eecc59439 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite
index 2d5ae6a57c..2d5ae6a57c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml
index 56e127b539..56e127b539 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
index 431b2995aa..431b2995aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/pom.xml
index f3cea546f6..f3cea546f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java
index f97d2c3a83..f97d2c3a83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java
index a04b40279f..a04b40279f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/main/resources/Helloworld.composite
index d37c93857d..d37c93857d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml
index e178823296..e178823296 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java
index 0ae70d6c3f..0ae70d6c3f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/pom.xml
index 4bf519493a..4bf519493a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/java/itest/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/java/itest/HelloworldService.java
index 1c7edaefb6..1c7edaefb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/java/itest/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/java/itest/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
index 5af221313e..5af221313e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
index a8640bf484..a8640bf484 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/resources/Helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/resources/Helloworld.composite
index 2d5ae6a57c..2d5ae6a57c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/resources/Helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/resources/Helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
index 56e127b539..56e127b539 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
index 6a639661cf..6a639661cf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/pom.xml
index 25d94ce3c4..25d94ce3c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
index 97fdb53d6c..97fdb53d6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
index 7dd52c5942..7dd52c5942 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
index cca3f7b6a0..cca3f7b6a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/src/test/resources/test.composite
index c0bb2bbc40..c0bb2bbc40 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scdl/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scdl/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/pom.xml
index 6656dd1d1d..6656dd1d1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
index 208ac3ba44..208ac3ba44 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
index e6bf08ccf2..e6bf08ccf2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/src/main/resources/scopes.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/src/main/resources/scopes.composite
index ed67bf5953..ed67bf5953 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/src/main/resources/scopes.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/src/main/resources/scopes.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index 594bdd5038..594bdd5038 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/pom.xml
index a886da22cc..a886da22cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
index 8b5cf4d29a..8b5cf4d29a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
index 3f68ac828a..3f68ac828a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
index 18242cd594..18242cd594 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
index dd143df036..dd143df036 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
index fb436ae10c..fb436ae10c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
index fc15b632d2..fc15b632d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
index 276093b69f..276093b69f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
index 84e15b5eb2..84e15b5eb2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
index db99472385..db99472385 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/resources/nodeA/CompositeA.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
index 9a1fa0a7f7..9a1fa0a7f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/resources/nodeA/CompositeA.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/resources/nodeB/CompositeB.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
index a72f5949ed..a72f5949ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/resources/nodeB/CompositeB.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
index bc5ede7605..bc5ede7605 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
index 843afe207c..843afe207c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
index 1a454c939a..1a454c939a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/pom.xml
index 0a5d2e7453..0a5d2e7453 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 26e58dc530..26e58dc530 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 627ff4976f..627ff4976f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index d04bd1b985..d04bd1b985 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index 01df89a8fa..01df89a8fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
index 07397e4502..07397e4502 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
index 8713e5ab22..8713e5ab22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index 842a85e000..842a85e000 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 8a3923b351..8a3923b351 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
index e52692fbf4..e52692fbf4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/resources/META-INF/sca-contribution.xml
index a687b3481a..a687b3481a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/resources/ServicesTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/resources/ServicesTest.composite
index 49fdf02f4b..49fdf02f4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/main/resources/ServicesTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/main/resources/ServicesTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index da779b2c54..da779b2c54 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/wires/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/pom.xml
index 83b66a5775..83b66a5775 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/wires/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
index f5a4337254..f5a4337254 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
index 82f0e26d58..82f0e26d58 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
index 67df1e3a52..67df1e3a52 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
index f0308252ba..f0308252ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/resources/WireTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/resources/WireTest.composite
index e697726a73..e697726a73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/main/resources/WireTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/main/resources/WireTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
index 2a0095cabc..2a0095cabc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/README b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/README
index cf635e78d0..cf635e78d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/pom.xml
index 03878a282e..03878a282e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
index e712ec8b53..e712ec8b53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
index d09b2af230..d09b2af230 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
index 652f7b53c4..652f7b53c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
index 85e55888c6..85e55888c6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
index 51f6dd4d51..51f6dd4d51 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
index 67236a5f98..67236a5f98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
index 0188dc0d41..0188dc0d41 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/pom.xml
index a9498952eb..a9498952eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
index 7c63fd5ba9..7c63fd5ba9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
index 78d8077bcd..78d8077bcd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
index 0e6a10cc62..0e6a10cc62 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
index 0cd2b4419d..0cd2b4419d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-client/pom.xml
index 3c02abe3a4..3c02abe3a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
index da40a7f442..da40a7f442 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
index 11ed0a3353..11ed0a3353 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
index 3c347570a0..3c347570a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-service/pom.xml
index b5e2d713d4..b5e2d713d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
index 796ef82792..796ef82792 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
index ba7e033f63..ba7e033f63 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/launcher-ri/pom.xml
index f3495317a4..f3495317a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/launcher-ri/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/launcher-ri/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
index 3c14218118..3c14218118 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
index a69fe483bf..a69fe483bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/pom.xml
index c5128ddde1..c5128ddde1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws-jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws-jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/pom.xml
index 5383a7f36f..5383a7f36f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 98eb6e361b..98eb6e361b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 2c6c4fc92c..2c6c4fc92c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index 885844260a..885844260a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 04fe620be4..04fe620be4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
index d4e651b271..d4e651b271 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index 166565baa0..166565baa0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
index ef307f58bb..ef307f58bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/pom.xml
index 1b8ed1833f..1b8ed1833f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
index a1233f6d25..a1233f6d25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
index 0695ace7f4..0695ace7f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index f39566ccbf..f39566ccbf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
index 332f825a51..332f825a51 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 3bbf50a728..3bbf50a728 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
index cae74697f1..cae74697f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
index 1e4c1fcbff..1e4c1fcbff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/pom.xml
index 1e250ed0df..1e250ed0df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index d6db1c2d0b..d6db1c2d0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
index 4ba7e67de2..4ba7e67de2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 052b49ff55..052b49ff55 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
index 1b0af55874..1b0af55874 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
index f1cfe30475..f1cfe30475 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/pom.xml
index 5886e93df1..5886e93df1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
index 8f77c63213..8f77c63213 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
index e248815805..e248815805 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
index 9d0a4ce5b4..9d0a4ce5b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
index 8439696fa8..8439696fa8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
index 5b8578c816..5b8578c816 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
index c7863a5ff8..c7863a5ff8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
index 63c6a89cfb..63c6a89cfb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
index 9991a415f9..9991a415f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
index 1ea7ab5a36..1ea7ab5a36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
index fe68755c47..fe68755c47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
index baa223f41c..baa223f41c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
index 73ca02246d..73ca02246d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
index bad94bbbc3..bad94bbbc3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
index 4ecf016e5a..4ecf016e5a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
index 13163d62ab..13163d62ab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
index bb492557d4..bb492557d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
index e038cc3116..e038cc3116 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/README b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/README
index 41dcb8680b..41dcb8680b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/pom.xml
index b9d6acca36..b9d6acca36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 98eb6e361b..98eb6e361b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 2c6c4fc92c..2c6c4fc92c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index 3662007984..3662007984 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
index 7e71dd465f..7e71dd465f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 04fe620be4..04fe620be4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
index d7251590ba..d7251590ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index aa21221b30..aa21221b30 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index a352696b8e..a352696b8e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
index d67bccdf8b..d67bccdf8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
index 2fc448aacc..2fc448aacc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/pom.xml
index ee9553f553..ee9553f553 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/pom.xml
index d1d0436bea..d1d0436bea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
index 963712c0c2..963712c0c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
index ab5fc0f873..ab5fc0f873 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
index 2574788dfa..2574788dfa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
index d6db1c2d0b..d6db1c2d0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
index e248815805..e248815805 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
index 8439696fa8..8439696fa8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
index 5b8578c816..5b8578c816 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
index 052b49ff55..052b49ff55 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
index 421d5d6166..421d5d6166 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
index 24cf3eebad..24cf3eebad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
index b78909142f..b78909142f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
index c520d2e3b2..c520d2e3b2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
index 29be66fb71..29be66fb71 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-prec.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-prec.composite
index affe6addbe..affe6addbe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-prec.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-prec.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-prec.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-prec.wsdl
index 5908c43e7d..5908c43e7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-prec.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-prec.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
index 1a2272d7ee..1a2272d7ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
index 686b08a1d4..686b08a1d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
index 105c82a411..105c82a411 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
index 4b6f982c26..4b6f982c26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
index aca50f466a..aca50f466a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
index 9f84fab262..9f84fab262 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
index b57d5f5b54..b57d5f5b54 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
index b79ee7d254..b79ee7d254 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
index 1814e2cc7f..1814e2cc7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
index fb2ba66e6c..fb2ba66e6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
index 55c2a4822d..55c2a4822d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/UriPrecedenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/UriPrecedenceTestCase.java
index 910f1fa9ef..910f1fa9ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/UriPrecedenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/UriPrecedenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/README b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/README
index 8754eeae6e..8754eeae6e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/pom.xml
index afcdf6634a..afcdf6634a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyLaunchMojo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyLaunchMojo.java
index 55b0a51b7f..55b0a51b7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyLaunchMojo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyLaunchMojo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
index edb7e0f0de..edb7e0f0de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/maven/maven-tuscany-plugin/src/main/java/org/apache/tuscany/maven/plugin/TuscanyRunMojo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xml/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xml/META-INF/MANIFEST.MF
index 57e693005b..57e693005b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xml/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xml/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xml/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xml/pom.xml
index 3e6cfe2d6c..3e6cfe2d6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xml/pom.xml
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 1b64c9aa33..1b64c9aa33 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index b5fe005812..b5fe005812 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 9a4a0dc035..9a4a0dc035 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index b402b6e3a3..b402b6e3a3 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index 5ba42a0dec..5ba42a0dec 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 7a396fe100..7a396fe100 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index 2cace7d68d..2cace7d68d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index 9930096a26..9930096a26 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 9fd8aeb803..9fd8aeb803 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index e6e172a44b..e6e172a44b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
index 9b2b1cca6c..9b2b1cca6c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java
index eda90c9d44..eda90c9d44 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointReferenceProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
index 0391acc676..0391acc676 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Messages.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
index 286f109f44..286f109f44 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicySubjectProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
index 28f4f9fb25..28f4f9fb25 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/SCABindingProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java
index af59324c7c..af59324c7c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefaultDefinitionsExtensionPoint.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
index d0a42be34e..d0a42be34e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java
index 3058b1f5b6..3058b1f5b6 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsExtensionPoint.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
index 006b80ee31..006b80ee31 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
index 38cc4a9de2..38cc4a9de2 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/Messages.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index 70c71c5f1f..70c71c5f1f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
index 95d8e67bf7..95d8e67bf7 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index ec4e17385f..ec4e17385f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
index 296677d8b8..296677d8b8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
index ee8b5274cc..ee8b5274cc 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/Messages.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 69c5a11e9b..69c5a11e9b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 6309cc5403..6309cc5403 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
index 10f142c67b..10f142c67b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
index ca44667903..ca44667903 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolver.java
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.DefinitionsExtensionPoint
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/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/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-RC1/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/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-RC1/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/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-RC1/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/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-RC1/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/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessorTestCase.java
index 3f4a74ba03..3f4a74ba03 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessorTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
index 0d5e69bd61..0d5e69bd61 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index 155c0c5a47..155c0c5a47 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index 473e483d31..473e483d31 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 05d320b211..05d320b211 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
index 28a2bb6851..28a2bb6851 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
index 7a36c1d97d..7a36c1d97d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
index fc675dcdce..fc675dcdce 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index df588e3504..df588e3504 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index 28e679da4a..28e679da4a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StripURISpacesTestCase.java
index 8d9bc72389..8d9bc72389 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/StripURISpacesTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
index b6f4c11ac2..b6f4c11ac2 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
index cfec8dee7a..cfec8dee7a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index 5e3fa15b69..5e3fa15b69 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index f83a2ebd14..f83a2ebd14 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 543aaf9893..543aaf9893 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index a19ce79490..a19ce79490 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
index f50cd5811f..f50cd5811f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteNamespacesTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java
index 58e6e534b9..58e6e534b9 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/MockPolicy.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
index f99b81f73f..f99b81f73f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java
index a148e33029..a148e33029 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/definitions/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
index 4f8c608459..4f8c608459 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunctionResolverTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 231bdfd516..231bdfd516 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
index aea2c3adb8..aea2c3adb8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index be0c1eb737..be0c1eb737 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index 83fa64cef4..83fa64cef4 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite
index 287810b156..287810b156 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorURISpaces.composite
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
index 0d344ac937..0d344ac937 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Multiplicity.composite
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
index 5606e653bb..5606e653bb 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/NestedCalculator.composite
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index 9140403fc4..9140403fc4 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 195dfcf106..195dfcf106 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index 42e6c1c3ec..42e6c1c3ec 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 424cec3e8a..424cec3e8a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
index 279f7d534e..279f7d534e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/local.composite
diff --git a/sca-java-2.x/tags/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-RC1/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/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/sca-java-2.x/tags/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-RC1/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/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/definitions/xml/test_definitions.xml
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
index 0e7aad877e..0e7aad877e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/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-RC1/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/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-RC1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xsd/LICENSE
index 0bea130c88..0bea130c88 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xsd/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xsd/META-INF/MANIFEST.MF
index ff93db6b14..ff93db6b14 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xsd/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xsd/NOTICE
index c5118ba0fd..c5118ba0fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xsd/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xsd/pom.xml
index 77334729b9..77334729b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly-xsd/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly-xsd/pom.xml
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
index 3e9bf490cb..3e9bf490cb 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/java/org/apache/tuscany/sca/assembly/xsd/Constants.java
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
index e8e8f7625a..e8e8f7625a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/XMLSchema.dtd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
index 685e89a57e..685e89a57e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/datatypes.dtd
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/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/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-RC1/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/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-RC1/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/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-RC1/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/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-addr.xsd
diff --git a/sca-java-2.x/tags/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-RC1/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/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/ws-policy.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
index 7fb8c1beed..7fb8c1beed 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/wsdli.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
index ac4b0ec8e6..ac4b0ec8e6 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xml.xsd
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly-xsd/src/main/resources/org/apache/tuscany/sca/assembly/xsd/xmldsig-core-schema.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
index 5f3c796810..5f3c796810 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
index 4bccf9d5f8..4bccf9d5f8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-ejb-1.1-cd01.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
index 824ba95b47..824ba95b47 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-jca-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
index 50e6aa6201..50e6aa6201 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-jms-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
index a337296d45..a337296d45 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-sca-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
index 65e200bf8a..65e200bf8a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-ws-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
index 874e36bab8..874e36bab8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-binding-ws-callback-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
index da391a983f..da391a983f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
index a93c4c5960..a93c4c5960 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-contribution-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
index 98fffa201f..98fffa201f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-contribution-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
index 6131804edc..6131804edc 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd02.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
index ab0fce9ac8..ab0fce9ac8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-core-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
index 8f2f20db19..8f2f20db19 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-definitions-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
index 967dadf395..967dadf395 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel-1.1-cd03.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
index ee4b313e6d..ee4b313e6d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
index f2780f9895..f2780f9895 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-composite-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
index b54ced4e4e..b54ced4e4e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
index 2856a51450..2856a51450 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-java-1.1-cd02.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
index 5ef3e86c92..5ef3e86c92 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-implementation-spring-1.1-cd01.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
index 518f0747fb..518f0747fb 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-interface-c-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
index b07bf01f1d..b07bf01f1d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-interface-cpp-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
index 7b78e13749..7b78e13749 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-interface-java-1.1-cd04.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
index 8d3510be7d..8d3510be7d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl-1.1-cd05.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
index 97b44f8da5..97b44f8da5 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-jee-1.1-wd03.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
index 61693046c1..61693046c1 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
index 4505850072..4505850072 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/sca-policy-1.1-intents-definitions-cd03.xml
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.xsd
index 603455a1f2..603455a1f2 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-atom.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
index 52445c14c5..52445c14c5 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-dwr.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
index 67feb54963..67feb54963 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-http.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
index 200f3e50a4..200f3e50a4 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jms.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
index d1bdcbdfae..d1bdcbdfae 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-jsonrpc.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd
index f19a0c4248..f19a0c4248 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rest.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
index ea39a773e0..ea39a773e0 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rmi.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.xsd
index 9857ec62b7..9857ec62b7 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-binding-rss.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
index c97b91251b..c97b91251b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-osgi.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
index fab809c7e1..fab809c7e1 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-script.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
index 491cb2abce..491cb2abce 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1-implementation-widget.xsd
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
index 4cf8649bc6..4cf8649bc6 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly-xsd/src/main/resources/tuscany-sca-1.1.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly/META-INF/MANIFEST.MF
index 61b8b3ffea..61b8b3ffea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/assembly/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly/pom.xml
index 0420331be2..0420331be2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/assembly/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/assembly/pom.xml
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index dca1decb76..dca1decb76 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 45fa05d66c..45fa05d66c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 5d82b9b727..5d82b9b727 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index b9abb90b03..b9abb90b03 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 9b96556173..9b96556173 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index d34ec7d01f..d34ec7d01f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index efd8557e07..efd8557e07 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 1202b4d83a..1202b4d83a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index ad72780de8..ad72780de8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index e1e3eab90c..e1e3eab90c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index f748828999..f748828999 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 64a55f1b44..64a55f1b44 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index 88cb2f9a2c..88cb2f9a2c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 575d0784ce..575d0784ce 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index fcfa689a7d..fcfa689a7d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 0c57c74ec0..0c57c74ec0 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 6d8350fc66..6d8350fc66 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index 43bf17d66a..43bf17d66a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index 5c2ad74f54..5c2ad74f54 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index da8d054140..da8d054140 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
index d179ce7b3b..d179ce7b3b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 3912896f0c..3912896f0c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5b719e50bc..5b719e50bc 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
index 9df72e358d..9df72e358d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index d82d923605..d82d923605 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index c65b6213b0..c65b6213b0 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 2ee3e774e4..2ee3e774e4 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index aa356e3857..aa356e3857 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index feae980326..feae980326 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 1f3d412364..1f3d412364 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index 075b50eec1..075b50eec1 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
index c622737454..c622737454 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 7be207cdd2..7be207cdd2 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
index 374c36c1f5..374c36c1f5 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
index d432bf3f29..d432bf3f29 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 50bf10f54a..50bf10f54a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
index 6dba234f0f..6dba234f0f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
index d47c3d9032..d47c3d9032 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
index 4f2842c61a..4f2842c61a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
index 423c856973..423c856973 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java
index 2bfbe85664..2bfbe85664 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 24dc20f815..24dc20f815 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index 3e44f5f7ae..3e44f5f7ae 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 24b1a0e03e..24b1a0e03e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 0759ff1361..0759ff1361 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 516b11724f..516b11724f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
index d912606f1d..d912606f1d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index dcd6c7b08a..dcd6c7b08a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 8a03df339c..8a03df339c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index 9db522930f..9db522930f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 78b54668b3..78b54668b3 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index f8c9f53413..f8c9f53413 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index b52c65ef8b..b52c65ef8b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index fba6af7e7f..fba6af7e7f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index ae5fad461b..ae5fad461b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 55b48ec578..55b48ec578 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 32377faf54..32377faf54 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 2b72f1f047..2b72f1f047 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 34ece5a24b..34ece5a24b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
index d13740b287..d13740b287 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 340fa2854c..340fa2854c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
index e69eb4a771..e69eb4a771 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 677e86c759..677e86c759 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 263af296b1..263af296b1 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 69d76f238d..69d76f238d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index 84e5825b50..84e5825b50 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index b42f3f929f..b42f3f929f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 62523e5c17..62523e5c17 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index a4990f6a98..a4990f6a98 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
index 156fd0af75..156fd0af75 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
index 7a63bbedc5..7a63bbedc5 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
index 5c68c6cbff..5c68c6cbff 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
index f45be80888..f45be80888 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
index 616616ae7a..616616ae7a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
index d87d45b27a..d87d45b27a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
index 224bc0a69a..224bc0a69a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
index eb74677236..eb74677236 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java
index e05a05476a..e05a05476a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 386275b41b..386275b41b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index 4aa5f2780a..4aa5f2780a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index 179dc1755e..179dc1755e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index e3103b768a..e3103b768a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 054b18c349..054b18c349 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index d1958eb00b..d1958eb00b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
index db1d5f7fd7..db1d5f7fd7 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index 392e81a8fa..392e81a8fa 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index 0cac606e1a..0cac606e1a 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index 2e82c201d9..2e82c201d9 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 1757ab3c92..1757ab3c92 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 92ac0850e7..92ac0850e7 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index 12ea22938c..12ea22938c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index a62813edd4..a62813edd4 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 468083c839..468083c839 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index c56b5545ce..c56b5545ce 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 0acb326a47..0acb326a47 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 38e33e33d9..38e33e33d9 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 334c826f86..334c826f86 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 849b922285..849b922285 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index abae4e7e38..abae4e7e38 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 2252434c39..2252434c39 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index fd1b840b17..fd1b840b17 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
index f43c428563..f43c428563 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
index f8f8a48b06..f8f8a48b06 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
index d142015f57..d142015f57 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index b2578fab49..b2578fab49 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 5b401baeb3..5b401baeb3 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
index ee4f5b5236..ee4f5b5236 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java
index 6bb7244e05..6bb7244e05 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
index b7de263789..b7de263789 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index b2ac5ca409..b2ac5ca409 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index a1ae3892e4..a1ae3892e4 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
index e585fcf384..e585fcf384 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
index c1862283c7..c1862283c7 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 1a2a9c5bad..1a2a9c5bad 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
index 97fbc19ced..97fbc19ced 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index 5c285e4d95..5c285e4d95 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 27a77f3ba8..27a77f3ba8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index 357b7afab4..357b7afab4 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
index b9f9fa5eb4..b9f9fa5eb4 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index c67ff1eab8..c67ff1eab8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 75d1229cd8..75d1229cd8 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
index 102bea8d41..102bea8d41 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
index 8a4adb3d7f..8a4adb3d7f 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 20189eae98..20189eae98 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 6e24d0bcfd..6e24d0bcfd 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/sca-java-2.x/tags/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-RC1/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/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
index c1cb41d967..c1cb41d967 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
index e2da378609..e2da378609 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 6ff07189e1..6ff07189e1 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/sca-java-2.x/tags/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-RC1/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/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-RC1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
diff --git a/sca-java-2.x/tags/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-RC1/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/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-RC1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
diff --git a/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 b/sca-java-2.x/tags/2.0-M5.1-RC1/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/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-RC1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
diff --git a/sca-java-2.x/tags/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-RC1/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/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-RC1/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 20fd74d46e..20fd74d46e 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index a09f7af06c..a09f7af06c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 6777c33ff1..6777c33ff1 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index 24be8a3e7d..24be8a3e7d 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index 603d393e5c..603d393e5c 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index d1faa5cf2b..d1faa5cf2b 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 2775c4ac71..2775c4ac71 100644
--- a/sca-java-2.x/tags/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-RC1/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/META-INF/MANIFEST.MF
index ba2b954239..ba2b954239 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/pom.xml
index bfd1639bb9..bfd1639bb9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
index abc3c0c342..abc3c0c342 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/src/main/java/org/apache/tuscany/sca/binding/atom/js/dojo/AtomBindingJavascriptProxyFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
index c9ff2ef9d2..c9ff2ef9d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/META-INF/MANIFEST.MF
index 4ae5784c2a..4ae5784c2a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1b9052299c..1b9052299c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/pom.xml
index 022baac0d6..022baac0d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
index 81ec1ddad3..81ec1ddad3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/Collection.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
index d318e5b7e7..d318e5b7e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/MediaCollection.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
index b457840922..b457840922 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/collection/NotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
index 5fd380dab6..5fd380dab6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
index 20fb9309d5..20fb9309d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
index a160925e4e..a160925e4e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
index fad06a0c99..fad06a0c99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
index 9291b8556b..9291b8556b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
index 155d07ae86..155d07ae86 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1accd4cfb4..1accd4cfb4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
index 77c2562c0f..77c2562c0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
index da3c8b7594..da3c8b7594 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomDeleteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
index 9c0ad5a26a..9c0ad5a26a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
index 7f74ef019d..7f74ef019d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomGetTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
index 50a684beba..50a684beba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
index 4e09eea032..4e09eea032 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomPutTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
index e6fa67883a..e6fa67883a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
index 07909388e1..07909388e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ConsumerProviderAtomTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
index 32b2a286b8..32b2a286b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
index 85c4d4f56a..85c4d4f56a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
index 4e3b8241f8..4e3b8241f8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
index 9e50cbbae7..9e50cbbae7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerCollectionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java
index dbf6b5aed5..dbf6b5aed5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/CustomerNonCollectionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
index 8ff89030db..8ff89030db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
index 6d4a173d30..6d4a173d30 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
index e2759235b0..e2759235b0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
index 6dbb15f6b9..6dbb15f6b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
index 34131f6195..34131f6195 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
index f94df3cff8..f94df3cff8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
index e10d442953..e10d442953 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
index 781a670f57..781a670f57 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
index 45d4c94768..45d4c94768 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
index 28ea465968..28ea465968 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
index 022b1269fd..022b1269fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java
index 95152af73d..95152af73d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/Headline.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
index ab97f4e340..ab97f4e340 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
index 7e40bb797d..7e40bb797d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
index b19f477912..b19f477912 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java
index 1afad216e3..1afad216e3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/util/AtomTestCaseUtils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
index bfeee9b2f4..bfeee9b2f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/ReceiptToms.gif
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
index 584f39ea8d..584f39ea8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/ReceiptValue.jpg
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
index 43d8a7feda..43d8a7feda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Consumer.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
index 819e19a801..819e19a801 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/Provider.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
index 580e0ac324..580e0ac324 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ProviderNonCollection.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
index bac14b5b8b..bac14b5b8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/ReceiptProvider.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
index 63085b3ea6..63085b3ea6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
index bc74509dc5..bc74509dc5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom-runtime/src/test/resources/org/apache/tuscany/sca/binding/atom/news/news.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/META-INF/MANIFEST.MF
index 712a19bfa2..712a19bfa2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
index a8117db8f3..a8117db8f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 00a4dfe0d2..00a4dfe0d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/pom.xml
index ed75ebf23f..ed75ebf23f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
index 7ac6e05bc9..7ac6e05bc9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
index 6e5623e1a2..6e5623e1a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/AtomBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
index ea06625d34..ea06625d34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
index c06a14726a..c06a14726a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/java/org/apache/tuscany/sca/binding/atom/impl/AtomBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
index 9fc6a6bc22..9fc6a6bc22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 47798f1607..47798f1607 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
index bfa922cbe4..bfa922cbe4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-atom/src/test/java/org/apache/tuscany/sca/binding/atom/AtomBindingProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/META-INF/MANIFEST.MF
index 395aa218a3..395aa218a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/pom.xml
index 952a821046..952a821046 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
index bf0cc34195..bf0cc34195 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
index 0ad3b2240e..0ad3b2240e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
index 19ab58cc74..19ab58cc74 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
index 0aa2e7394a..0aa2e7394a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/CorbaServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
index b3569e43b9..b3569e43b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/CorbaException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
index a554f56035..a554f56035 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/exceptions/RequestConfigurationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
index 823db1e748..823db1e748 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaArray.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
index feb6627e25..feb6627e25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
index 1e7a0087e0..1e7a0087e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/meta/CorbaUnionElementType.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
index e7d0b8b91b..e7d0b8b91b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaRequest.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
index 6a01c70a38..6a01c70a38 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/DynaCorbaResponse.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
index 2828e09cc7..2828e09cc7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceInstanceCreator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
index c5c98ab27c..c5c98ab27c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/reference/InterfaceMethodInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
index 5babc25b07..5babc25b07 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/ComponentInvocationProxy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
index d8524eaee9..d8524eaee9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/DynaCorbaServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
index 57e2fae9f4..57e2fae9f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
index 2e2066802a..2e2066802a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/InvocationProxy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
index 766048ac64..766048ac64 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/service/OperationTypes.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
index ab7371bbe8..ab7371bbe8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/AnnotationAttributes.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
index 706a44406b..706a44406b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/NodeType.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
index d4207ab735..d4207ab735 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTree.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
index 1ba4002303..1ba4002303 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeCreator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
index 009eac3377..009eac3377 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/TypeTreeNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
index 34bee2a0e4..34bee2a0e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/UnionAttributes.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
index 35a1e539d9..35a1e539d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ArrayTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
index bbc2012a38..bbc2012a38 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/BooleanTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
index 761cc5d62c..761cc5d62c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ByteTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
index b2d2afd011..b2d2afd011 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/CharTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
index f667123bb7..f667123bb7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/DoubleTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
index ae52bd6bbf..ae52bd6bbf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/EnumTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
index 7c39725012..7c39725012 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/FloatTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
index e903b59e50..e903b59e50 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/IntTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
index 79d3c0cbc8..79d3c0cbc8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/LongTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
index c89a25401d..c89a25401d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ReferenceTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
index 911c787b11..911c787b11 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/SequenceTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
index f4cdabc8e2..f4cdabc8e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/ShortTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
index 5a4fcba221..5a4fcba221 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StringTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
index 1fc729b926..1fc729b926 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/StructTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
index 0f1f973f49..0f1f973f49 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
index ded82bf12e..ded82bf12e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/TypeHelpersProxy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
index df2e833fcd..df2e833fcd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/UnionTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
index 7ccd70f69e..7ccd70f69e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/types/util/Utils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
index f9facac0cc..f9facac0cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/MethodFinder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
index 414e50abf4..414e50abf4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/provider/util/OperationMapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 9855dec8af..9855dec8af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
index f1025e0693..f1025e0693 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaServantTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
index 1b1754f347..1b1754f347 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/CorbaTypesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
index f0dccd9e7e..f0dccd9e7e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MappingTestInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
index 6975c62ddb..6975c62ddb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/MethodFinderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
index 4767728db7..4767728db7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/OperationMappingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
index 962a00d002..962a00d002 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/TestConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
index 9d5b1e589f..9d5b1e589f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
index 7524a2529d..7524a2529d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
index 96097f7b1c..96097f7b1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
index f7a1ae7c52..f7a1ae7c52 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTestsOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
index 01c5ce756e..01c5ce756e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
index 2e77281951..2e77281951 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
index db02bdda12..db02bdda12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/InnerUnionHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
index 8f0e79b326..8f0e79b326 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
index c96b3728c2..c96b3728c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
index 6fe266ab45..6fe266ab45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/RichUnionHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
index 5337d33148..5337d33148 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
index d87e301cb5..d87e301cb5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/StringArrayHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
index 0a0a8080a5..0a0a8080a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
index fdc85c7ef4..fdc85c7ef4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
index 2e72f6a0f4..2e72f6a0f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/TestStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
index 35f1fb0370..35f1fb0370 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
index 30836ee18f..30836ee18f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
index e3c28f8b91..e3c28f8b91 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/Color.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
index 775cac8e16..775cac8e16 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
index 32cd9c8df6..32cd9c8df6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/ColorHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
index 3f73557952..3f73557952 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManager.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
index a6160a7643..a6160a7643 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
index 6afa6bc806..6afa6bc806 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
index bab0c27f77..bab0c27f77 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/EnumManagerOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
index 514627ff4b..514627ff4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
index 4629ca9cff..4629ca9cff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/enums/_EnumManagerStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
index aa480f93ac..aa480f93ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/Calc.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
index 5ed36ca19b..5ed36ca19b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
index ec1cfadd1e..ec1cfadd1e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
index 29865ace06..29865ace06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
index d7839ec4db..d7839ec4db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/Arguments.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
index c47d63208f..c47d63208f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
index f767e8c11a..f767e8c11a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/ArgumentsHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
index e7cbb4b8ca..e7cbb4b8ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZero.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
index 5d27f9969c..5d27f9969c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
index ab01c66675..ab01c66675 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/DivByZeroHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
index f4ea58e55e..f4ea58e55e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupported.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
index 82609a36c1..82609a36c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
index 1389bd33d9..1389bd33d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/CalcPackage/NotSupportedHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
index a73e252129..a73e252129 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
index 65ce051129..65ce051129 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/exceptions/_CalcStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
index fde204edf8..fde204edf8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
index 71b4fbbdb6..71b4fbbdb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
index d758a560a9..d758a560a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
index 464c2ccbc3..464c2ccbc3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/ArraysSetterOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
index c053f12a02..c053f12a02 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
index 566689960e..566689960e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
index 6564957081..6564957081 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
index 26669de95a..26669de95a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/PrimitivesSetterOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
index 5a140f5ecc..5a140f5ecc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
index 2a8fe73417..2a8fe73417 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
index 63e3926dd2..63e3926dd2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
index a8231236eb..a8231236eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/RemoteObjectOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
index ca86420240..ca86420240 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
index 2a8898d38f..2a8898d38f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
index bed30e00ca..bed30e00ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SimpleStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
index 73dbd6c198..73dbd6c198 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
index 8f524ffeb1..8f524ffeb1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
index 3231a136dc..3231a136dc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/SomeStructHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
index 28d3ecdc91..28d3ecdc91 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
index 29ff2edfd2..29ff2edfd2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
index b8aea13c8d..b8aea13c8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
index 0bacb6746a..0bacb6746a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/TestObjectOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
index c6e8c2a4e0..c6e8c2a4e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
index 079cc6e899..079cc6e899 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_ArraysSetterStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
index b444ce68d8..b444ce68d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
index 0b08e1fb67..0b08e1fb67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_PrimitivesSetterStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
index a87534f88b..a87534f88b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
index e219dfa338..e219dfa338 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_RemoteObjectStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
index c0bc0d6ebd..c0bc0d6ebd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
index ad47595ddf..ad47595ddf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/_TestObjectStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
index f3d96e8fd7..f3d96e8fd7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
index cb0ab8bcfd..cb0ab8bcfd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/boolean_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
index 0bde1e701c..0bde1e701c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
index 19b2942cfe..19b2942cfe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/char_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
index 8bb5a9c69d..8bb5a9c69d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
index dc89e71092..dc89e71092 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/double_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
index 7b71aa0a9f..7b71aa0a9f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
index 513bab37cc..513bab37cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/float_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
index c1d06e2ba9..c1d06e2ba9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
index f9ad7b77ac..f9ad7b77ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
index cfb292fc01..cfb292fc01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
index 02f46a7d85..02f46a7d85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_long_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
index 505aa3f026..505aa3f026 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Helper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
index 5cbaa109ee..5cbaa109ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq1Holder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
index 2f792888fb..2f792888fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Helper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
index 8b2ccc1f73..8b2ccc1f73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq2Holder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
index 67e224f0be..67e224f0be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Helper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
index 5d4adfba2d..5d4adfba2d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/long_seq3Holder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
index c7d86d9179..c7d86d9179 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
index 09b2b85c6a..09b2b85c6a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/octet_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
index e88b1e06c4..e88b1e06c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
index d3f996c5b4..d3f996c5b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/remote_object_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
index 7c58d47f7c..7c58d47f7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
index 5be5a65c43..5be5a65c43 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/short_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
index a40d5fa8de..a40d5fa8de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
index 76f99408f2..76f99408f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/string_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
index d7594b0815..d7594b0815 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
index e9fbcccc36..e9fbcccc36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
index 6ef187c4e5..6ef187c4e5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
index 59bc015c38..59bc015c38 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_long_long_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
index ec4526cebf..ec4526cebf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
index 56ab28f0be..56ab28f0be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/unsigned_short_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
index 73a10d3b7f..73a10d3b7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
index c5c1e87756..c5c1e87756 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wchar_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
index 3e45568f01..3e45568f01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
index bdbf9d995b..bdbf9d995b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/generated/wstring_listHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
index ba1a5c0a51..ba1a5c0a51 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/ArraysTestStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
index 7c33b1d449..7c33b1d449 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/Calc.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
index d0ebff5fec..d0ebff5fec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/DummyObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
index 6e4204b9b7..6e4204b9b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InnerUnion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
index cb3b6842c3..cb3b6842c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidCorbaArray.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
index 0c9de5bb31..0c9de5bb31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
index 8746eb7f9b..8746eb7f9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
index 6d124b0485..6d124b0485 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidEnum3.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
index 8cf66e2fac..8cf66e2fac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
index 5f361512f0..5f361512f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
index adc81ea5a2..adc81ea5a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidStruct3.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
index 4f6d0085af..4f6d0085af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
index 98462bbabe..98462bbabe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
index 994ed6aea3..994ed6aea3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion3.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
index d68d903375..d68d903375 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion4.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
index d4f8b0e6fa..d4f8b0e6fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/InvalidUnion5.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
index a514b5e222..a514b5e222 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/NonCorbaException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
index 452dee8d95..452dee8d95 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/RichUnion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
index 85ca3798f4..85ca3798f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SimpleStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
index d8cdf1835a..d8cdf1835a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/hierarchy/SomeStruct.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
index bb72fdbbf3..bb72fdbbf3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
index 606d333bb3..606d333bb3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
index 0ff9540502..0ff9540502 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
index 912bd16f9b..912bd16f9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/DummyObjectOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
index 79f7959c72..79f7959c72 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManager.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
index 495a614d84..495a614d84 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
index 11cfc82ac2..11cfc82ac2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
index e0e56d1017..e0e56d1017 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/ObjectManagerOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
index c706661eaa..c706661eaa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
index c9a31deb27..c9a31deb27 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_DummyObjectStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
index a6b55b8bae..a6b55b8bae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
index e06a078a93..e06a078a93 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/references/_ObjectManagerStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
index 0aec4d278d..0aec4d278d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysSetterServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
index d9bde48a5a..d9bde48a5a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
index 9ff94f8313..9ff94f8313 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ArraysUnionsTuscanyServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
index fd789e19cb..fd789e19cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/CalcServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
index 2e205f1d0f..2e205f1d0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/DummyObjectServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
index 52386aeef7..52386aeef7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/EnumManagerServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
index b7fbb69627..b7fbb69627 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTestObjectServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
index dda8203f79..dda8203f79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/InvalidTypesServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
index 20700a0392..20700a0392 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/NonCorbaServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
index 213c7fbd7c..213c7fbd7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/ObjectManagerServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
index 92e18741ae..92e18741ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/PrimitivesSetterServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
index 153268983f..153268983f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/servants/TestObjectServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
index 7ebc3fce85..7ebc3fce85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestDataType.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
index 757beeae7d..757beeae7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
index d691705955..d691705955 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestInterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
index 3a55eb642c..3a55eb642c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestOperation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
index bc19b82aec..bc19b82aec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeComponentService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
index e68f4dee72..e68f4dee72 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/service/mocks/TestRuntimeWire.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
index 0f4ed03b4e..0f4ed03b4e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/arrays_unions.idl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/enums.idl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/enums.idl
index 2e4e829b0f..2e4e829b0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/enums.idl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/enums.idl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/exceptions.idl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/exceptions.idl
index b34ec46458..b34ec46458 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/exceptions.idl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/exceptions.idl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/general_tests.idl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/general_tests.idl
index db253338c3..db253338c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/general_tests.idl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/general_tests.idl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/references.idl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/references.idl
index 72b58806e6..72b58806e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba-runtime/src/test/resources/references.idl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba-runtime/src/test/resources/references.idl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/META-INF/MANIFEST.MF
index 6dfeae91cb..6dfeae91cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/pom.xml
index 8ee29340d2..8ee29340d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
index db8c32a400..db8c32a400 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
index 67e3bdcf74..67e3bdcf74 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/CorbaBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
index cecb4fb567..cecb4fb567 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
index 25d8ed6c99..25d8ed6c99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
index 8e5fcdc6e1..8e5fcdc6e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaBindingProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
index 57959840d4..57959840d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.corba.CorbaBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bafd086051..bafd086051 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
index 7167936ade..7167936ade 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/pom.xml
index a03c3e46d5..a03c3e46d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
index c65868c23b..c65868c23b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ClassLoadingUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
index 82554a1c8f..82554a1c8f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/DynamicStubClassLoader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
index de8090c45b..de8090c45b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/Java2IDLUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
index 1be4a98a48..1be4a98a48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/ObjectInputStreamExt.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
index 3ff0ed552a..3ff0ed552a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/StubMethodInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
index f9aa9ffa22..f9aa9ffa22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/corba/UtilInitializer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
index 999a3fcfd4..999a3fcfd4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
index e94ac8bce1..e94ac8bce1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
index 2a02bf0d08..2a02bf0d08 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/provider/EJBBindingReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
index c7c0f90710..c7c0f90710 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
index 0b97f42746..0b97f42746 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBLocator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
index 119282adb9..119282adb9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
index 72f7dc9e43..72f7dc9e43 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/EJBStubHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
index e60e526e01..e60e526e01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/InterfaceInfo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
index 651c967aad..651c967aad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/JavaReflectionAdapter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
index e7ea7c9077..e7ea7c9077 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/MethodInfo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
index 346b7c5cf6..346b7c5cf6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/java/org/apache/tuscany/sca/binding/ejb/util/NamingEndpoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 556abbaeac..556abbaeac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
index 337bb004b5..337bb004b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/account/BankManagerFacade.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/account/Customer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/account/Customer.java
index 8585301868..8585301868 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/account/Customer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/account/Customer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
index 7406b9bd37..7406b9bd37 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/account/CustomerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
index 7cefba530a..7cefba530a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
index 799bcaa672..799bcaa672 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/calculator/AddServiceHome.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
index e480e648d9..e480e648d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacade.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
index 0d02be3b95..0d02be3b95 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/geronimo/samples/bank/ejb/BankManagerFacadeHome.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
index e002e6ccb8..e002e6ccb8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/EJBReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
index 48e87fb6d1..48e87fb6d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/MockServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
index 66b3feb458..66b3feb458 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/java/org/apache/tuscany/sca/binding/ejb/tests/SocketTracer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/resources/account/account.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/resources/account/account.composite
index f308daa32d..f308daa32d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb-runtime/src/test/resources/account/account.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb-runtime/src/test/resources/account/account.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/META-INF/MANIFEST.MF
index e6179d19e6..e6179d19e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/pom.xml
index 08725cd81b..08725cd81b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
index cfaaeb284c..cfaaeb284c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
index 6e2c8d358f..6e2c8d358f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
index 13b069a6bb..13b069a6bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/EJBBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
index e84de86eca..e84de86eca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
index 4ee8f411a0..4ee8f411a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
index 71386db450..71386db450 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/java/org/apache/tuscany/sca/binding/ejb/impl/EJBBindingProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
index 2be8babe4d..2be8babe4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ejb.EJBBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 82edd9a61b..82edd9a61b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 0f970c8289..0f970c8289 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
index 28477dd3ac..28477dd3ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/binding-ejb-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml
index 965e127d04..965e127d04 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ejb/src/main/resources/org/apache/tuscany/sca/binding/ejb/policy/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/META-INF/MANIFEST.MF
index ab90529320..ab90529320 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/pom.xml
index 0fb226de70..0fb226de70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java
index 36d4e74813..36d4e74813 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java
index 63b18ce8a2..63b18ce8a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
index b56d8a1e50..b56d8a1e50 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java
index f7cb0ffeee..f7cb0ffeee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java
index d911e5b245..d911e5b245 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
index f588f87bdd..f588f87bdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java
index d25c32a68c..d25c32a68c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2fc977b41f..2fc977b41f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 3878c5f0da..3878c5f0da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java
index f7ca89e7bb..f7ca89e7bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java
index 79e695d38a..79e695d38a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
index 1183ae9732..1183ae9732 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
index e2462daa76..e2462daa76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
index 18cd2555b3..18cd2555b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
index 6c9a5d71bf..6c9a5d71bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/resources/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/resources/client.composite
index 7436a5e24b..7436a5e24b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/resources/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/resources/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/resources/client2.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/resources/client2.composite
index 20667984ca..20667984ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/resources/client2.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/resources/client2.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/resources/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/resources/service.composite
index 83f13a35f2..83f13a35f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-hazelcast-runtime/src/test/resources/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-hazelcast-runtime/src/test/resources/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/META-INF/MANIFEST.MF
index 175d11f601..175d11f601 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/pom.xml
index af36a42c21..af36a42c21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
index 0fe13337ef..0fe13337ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingListenerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
index 118a2c3bc4..118a2c3bc4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
index e20d420d49..e20d420d49 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPGetListenerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
index 41981d2db5..41981d2db5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
index f752dce3e1..f752dce3e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPServiceListenerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 15b0e51b74..15b0e51b74 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
index eed7975bc6..eed7975bc6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingCacheTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
index f314bed909..f314bed909 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/HTTPBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
index 1d6efea2a1..1d6efea2a1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/NotModifiedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
index 5728899ebe..5728899ebe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/PreconditionFailedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
index 959de1474c..959de1474c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestBindingCacheImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
index 333bacbab3..333bacbab3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestGetImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
index b8c1223894..b8c1223894 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/java/org/apache/tuscany/sca/binding/http/TestServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/resources/content/test.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/resources/content/test.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/resources/content/test.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/resources/test.composite
index e3525f4afd..e3525f4afd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/resources/testCache.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/resources/testCache.composite
index 4923cfa74d..4923cfa74d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http-runtime/src/test/resources/testCache.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http-runtime/src/test/resources/testCache.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/META-INF/MANIFEST.MF
index b0a4fc01fc..b0a4fc01fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/pom.xml
index ff4815558f..ff4815558f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
index e0ab1cfff7..e0ab1cfff7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
index 6ba6d8f934..6ba6d8f934 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
index 678cd1a426..678cd1a426 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
index 2555799f5f..2555799f5f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
index bdec50bde0..bdec50bde0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
index 3ca68b969b..3ca68b969b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f8c0fd2b64..f8c0fd2b64 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/META-INF/MANIFEST.MF
index a25cc85adb..a25cc85adb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/pom.xml
index 358d2bfd98..358d2bfd98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
index e38a9d0c60..e38a9d0c60 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/context/JMSBindingContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
index b067b6ed12..b067b6ed12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/headers/HeaderReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java
index 7de30c265a..7de30c265a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java
index 9dc41eb3bc..9dc41eb3bc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
index bb4b30d190..bb4b30d190 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultJMSServiceListenerFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
index 0e1ee1bfd0..0e1ee1bfd0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/DefaultServiceInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java
index e4bf31f7ee..e4bf31f7ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java
index b6ccb5be9b..b6ccb5be9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
index c183a720e2..c183a720e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerDetails.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java
index 5f3f773985..5f3f773985 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/host/JMSServiceListenerFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
index 61a2a076de..61a2a076de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
index 149d1c6b4b..149d1c6b4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
index da120ac6c1..da120ac6c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/runtime/OperationSelectorJMSDefaultServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
index 4352f5d416..4352f5d416 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
index 343aa8d52a..343aa8d52a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
index a151688c36..a151688c36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/runtime/OperationSelectorJMSUserPropServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationPolicyProviderFactory.java
index edecc18d2d..edecc18d2d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyInterceptor.java
index c5d0705eb6..c5d0705eb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java
index b3c7f40c55..b3c7f40c55 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyInterceptor.java
index c570354981..c570354981 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java
index 351b1c3f0f..351b1c3f0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/provider/JMSTokenAuthenticationServicePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderPolicyProviderFactory.java
index 4a199bcdff..4a199bcdff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyInterceptor.java
index 967614f9b9..967614f9b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java
index b3d7b584aa..b3d7b584aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/provider/JMSHeaderReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
index 8b665c91a8..8b665c91a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/AbstractMessageProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
index 7b14d29dfa..7b14d29dfa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/BytesMessageProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
index 17542ace9d..17542ace9d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSResourceFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java
index c538dd01da..c538dd01da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultMessageProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
index 15bd8713f2..15bd8713f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
index 8053ba69e4..8053ba69e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
index 225d514045..225d514045 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSBindingServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
index 821b9d7873..821b9d7873 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
index 2628bf50a1..2628bf50a1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSMessageProcessorUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
index 348764fe43..348764fe43 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
index 4fc20c0cb3..4fc20c0cb3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
index 61080516b3..61080516b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
index db0b94dce1..db0b94dce1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/ObjectMessageProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
index 0f4f88dcd8..0f4f88dcd8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/RRBJMSBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
index b468c73e7a..b468c73e7a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/TextMessageProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java
index 69a69064d0..69a69064d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLBytesMessageProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
index 5031f55c6b..5031f55c6b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/XMLTextMessageProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
index 9668333ebd..9668333ebd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
index 1a175ce026..1a175ce026 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
index 2245f61ee7..2245f61ee7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/CallbackDestinationInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
index bf046b473e..bf046b473e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wire/OperationPropertiesInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
index 7675698cc7..7675698cc7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
index 4620063076..4620063076 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
index 3d2c8ec18c..3d2c8ec18c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
index 506d47f8a3..506d47f8a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
index ef3530640f..ef3530640f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java
index a791c5f0b9..a791c5f0b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java
index e453940d30..e453940d30 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java
index e0f928de12..e0f928de12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java
index c1e97a93d0..c1e97a93d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java
index d2ff153227..d2ff153227 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java
index adf8c03c10..adf8c03c10 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
index 87d99a014e..87d99a014e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java
index 127680c283..127680c283 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java
index 731de78cfe..731de78cfe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java
index 3541666007..3541666007 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
index 1e445f1b11..1e445f1b11 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
index ec110ea0d2..ec110ea0d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
index 44e59a0226..44e59a0226 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
index 19baddd9da..19baddd9da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
index 2e50f27a47..2e50f27a47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
index e3522616c0..e3522616c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
index fd512f7d27..fd512f7d27 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
index 5baffd48dd..5baffd48dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
index c3f3660211..c3f3660211 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
index f4ee1226c5..f4ee1226c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
index fb119078d1..fb119078d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
index 4d62022196..4d62022196 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
index 957994a146..957994a146 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
index 8e4f8fb90b..8e4f8fb90b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
index c56a9e0e50..c56a9e0e50 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 1781985232..1781985232 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
index b5d5117b84..b5d5117b84 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index a54b133da6..a54b133da6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
index 4baf7ff14e..4baf7ff14e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
index a3a2f0bf1e..a3a2f0bf1e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
index d68270f7df..d68270f7df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
index a8808c1bd1..a8808c1bd1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
index 625d5b4817..625d5b4817 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/java/org/apache/tuscany/sca/binding/jms/OperationSelectionTestCaseFIXME.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/resources/simple/client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/resources/simple/client.composite
index dcea428493..dcea428493 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/resources/simple/client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/resources/simple/client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/resources/simple/service.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/resources/simple/service.composite
index 44b7b29610..44b7b29610 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms-runtime/src/test/resources/simple/service.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms-runtime/src/test/resources/simple/service.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/META-INF/MANIFEST.MF
index 9b6da67343..9b6da67343 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/pom.xml
index 09957d9edf..09957d9edf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/BindingProperty.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/BindingProperty.java
index d06170a70d..d06170a70d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/BindingProperty.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/BindingProperty.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
index 7480d8fe17..7480d8fe17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java
index 80bc61baa1..80bc61baa1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
index 74f030ca21..74f030ca21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
index e0e6f70cf5..e0e6f70cf5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefault.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefault.java
index a02decd20f..a02decd20f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefault.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefault.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefaultProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefaultProcessor.java
index 4f09eeb9a5..4f09eeb9a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefaultProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSDefaultProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserProp.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserProp.java
index f978adfa58..f978adfa58 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserProp.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserProp.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserPropProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserPropProcessor.java
index 9b731ffb1b..9b731ffb1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserPropProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/OperationSelectorJMSUserPropProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
index 24f43d3027..24f43d3027 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
index 4322595515..4322595515 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/authentication/token/JMSTokenAuthenticationPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
index 48fef397c7..48fef397c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
index c925c01554..c925c01554 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/policy/header/JMSHeaderPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytes.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytes.java
index a16cdc9c4f..a16cdc9c4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytes.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytes.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesProcessor.java
index 8be904da3e..8be904da3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXML.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXML.java
index 4f7a91657f..4f7a91657f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXML.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXML.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXMLProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXMLProcessor.java
index 33533b23eb..33533b23eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXMLProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSBytesXMLProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefault.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefault.java
index 5c33a3e2c8..5c33a3e2c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefault.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefault.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefaultProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefaultProcessor.java
index 6b5488a168..6b5488a168 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefaultProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSDefaultProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObject.java
index e043139010..e043139010 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObjectProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObjectProcessor.java
index cf0c0db0d7..cf0c0db0d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObjectProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSObjectProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSText.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSText.java
index 4f728cea92..4f728cea92 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSText.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSText.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextProcessor.java
index 5c564e044c..5c564e044c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXML.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXML.java
index be6187d2c5..be6187d2c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXML.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXML.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXMLProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXMLProcessor.java
index ae544f3163..ae544f3163 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXMLProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/WireFormatJMSTextXMLProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 3e6b2d887a..3e6b2d887a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
index f30da64ca4..f30da64ca4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties
index fd43b2c4e9..fd43b2c4e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/binding-jms-policy-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
index 9361bb0e3c..9361bb0e3c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/binding-jms-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
index 7a82f95da9..7a82f95da9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/main/resources/org/apache/tuscany/sca/binding/jms/policy/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
index 40e40c7326..40e40c7326 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
index db138aa30d..db138aa30d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/JMSBindingProcessorWriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
index 326bb54cca..326bb54cca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jms/src/test/java/org/apache/tuscany/sca/binding/jms/policy/PolicyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
index 9c5633ae1b..9c5633ae1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/pom.xml
index c315e0dc1a..c315e0dc1a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java
index 1f2ed09c07..1f2ed09c07 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
index a5d0c3a8da..a5d0c3a8da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java
index 0af9582e97..0af9582e97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java
index 4e3f7321af..4e3f7321af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
index b782875948..b782875948 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index f5d9de2a77..f5d9de2a77 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
index 5ee1f167ea..5ee1f167ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
index 99f2958d0d..99f2958d0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
index b252eddbed..b252eddbed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
index efec56bbe3..efec56bbe3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
index 065e888bb7..065e888bb7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/resources/jquery.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html
index a61cee3155..a61cee3155 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp-runtime/src/test/resources/jquery.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/META-INF/MANIFEST.MF
index 019cfda386..019cfda386 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/pom.xml
index a2ddb65d78..a2ddb65d78 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
index 8872d78fa6..8872d78fa6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java
index 2e8bebef0d..2e8bebef0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java
index be74a28e39..be74a28e39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java
index 4d0f03fe4d..4d0f03fe4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/impl/JSONPBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
index e1e8c6d3a5..e1e8c6d3a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f962b70f04..f962b70f04 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index f6c99dfaba..f6c99dfaba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
index e533ecd168..e533ecd168 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/META-INF/MANIFEST.MF
index a8d4ba39b3..a8d4ba39b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/pom.xml
index 8535f7e121..8535f7e121 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
index 0388c8bd77..0388c8bd77 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/js/dojo/JSONRPCBindingJavascriptProxyFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
index 88f2fa0dbe..88f2fa0dbe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-js-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
index 0e52141856..0e52141856 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/NOTICE
index 28064e5de1..28064e5de1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/pom.xml
index 7a39fe400a..7a39fe400a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
index b5ea6b1727..b5ea6b1727 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
index c9b9328b61..c9b9328b61 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java
index 2b0859c416..2b0859c416 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCClientInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCDatabindingHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCDatabindingHelper.java
index 3cdcb32830..3cdcb32830 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCDatabindingHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCDatabindingHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
index cd179a04c2..cd179a04c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
index 10e9368936..10e9368936 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
index 1177940891..1177940891 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
index 64339fda7b..64339fda7b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JavaToSmd.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index ceb74cffce..ceb74cffce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
index d837bab91c..d837bab91c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/main/resources/org/apache/tuscany/sca/binding/jsonrpc/provider/jsonrpc.js
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
index 4b159fb563..4b159fb563 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
index 322008de1f..322008de1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
index bd9d905475..bd9d905475 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoClientImpl.java
index f76ec74b16..f76ec74b16 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
index 08ccb6e6d5..08ccb6e6d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
index 0fd622d29b..0fd622d29b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCDataTypeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
index 56080058c8..56080058c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCExceptionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java
index efdb0a23db..efdb0a23db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
index 7c6ba6a99f..7c6ba6a99f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
index a1b076c0e8..a1b076c0e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCSmdTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
index 9c97574db7..9c97574db7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCBinding.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
index 16dcbce45f..16dcbce45f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc-runtime/src/test/resources/JSONRPCReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/META-INF/MANIFEST.MF
index a2a44e4e79..a2a44e4e79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/pom.xml
index 792183c6c6..792183c6c6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
index 1e14502d93..1e14502d93 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
index 707a9d7103..707a9d7103 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/JSONRPCBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
index 625457a668..625457a668 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
index 4c1a261e81..4c1a261e81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/impl/JSONRPCBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
index 9f68137afe..9f68137afe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonrpc.JSONRPCBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 4d14d00112..4d14d00112 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-jsonrpc/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/META-INF/MANIFEST.MF
index 1da959a392..1da959a392 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/pom.xml
index 3cb6571417..3cb6571417 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorInterceptor.java
index 928b80a044..928b80a044 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorProviderFactory.java
index d057f1a852..d057f1a852 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorReferenceProvider.java
index c560a13ae2..c560a13ae2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorServiceProvider.java
index 105c84ebda..105c84ebda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/provider/JAXRSOperationSelectorServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorInterceptor.java
index 0eb81cfda5..0eb81cfda5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorProviderFactory.java
index 011e89e7cc..011e89e7cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorReferenceProvider.java
index c87b2fc21d..c87b2fc21d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorServiceProvider.java
index e4a003d4b5..e4a003d4b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/provider/RPCOperationSelectorServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSProvider.java
index 1ccdb868d7..1ccdb868d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSReader.java
index d6df778feb..d6df778feb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java
index 740b685b22..740b685b22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/DataBindingJAXRSWriter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
index c8089904ae..c8089904ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java
index 4583b11879..4583b11879 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingListenerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
index 7c9ec85a9e..7c9ec85a9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java
index e218f32573..e218f32573 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
index 46002e3226..46002e3226 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java
index 1dac8a2c9a..1dac8a2c9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/RESTServiceListenerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
index 23b951c88a..23b951c88a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/provider/TuscanyRESTServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java
index fdcbc92c9c..fdcbc92c9c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatProviderFactory.java
index 6b1bb6cca7..6b1bb6cca7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatReferenceProvider.java
index 830b02a3e8..830b02a3e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatServiceProvider.java
index c90f5c331c..c90f5c331c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatInterceptor.java
index 3ece7c07a3..3ece7c07a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatProviderFactory.java
index 33900b3de9..33900b3de9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatReferenceProvider.java
index c9e0ac4578..c9e0ac4578 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatServiceProvider.java
index 9e532d2df2..9e532d2df2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/provider/XMLWireFormatServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 4a682c1cb6..4a682c1cb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
index be5e3ab636..be5e3ab636 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.OperationSelectorProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
index 80062349ff..80062349ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.WireFormatProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/NotModifiedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/NotModifiedException.java
index 49e7d67a76..49e7d67a76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/NotModifiedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/NotModifiedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/PreconditionFailedException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/PreconditionFailedException.java
index 1463e1a5db..1463e1a5db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/PreconditionFailedException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/PreconditionFailedException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/RESTBindingCacheTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/RESTBindingCacheTestCase.java
index 4db7fd64dc..4db7fd64dc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/RESTBindingCacheTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/RESTBindingCacheTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/RESTBindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/RESTBindingTestCase.java
index e08069f479..e08069f479 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/RESTBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/RESTBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestBindingCacheImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestBindingCacheImpl.java
index 5c5e4db8ed..5c5e4db8ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestBindingCacheImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestBindingCacheImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestGetImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestGetImpl.java
index 4cb1bce73f..4cb1bce73f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestGetImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestGetImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestServiceImpl.java
index 6b21d6094f..6b21d6094f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/TestServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/rpc/EchoServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/rpc/EchoServiceTestCase.java
index cb65249fe3..cb65249fe3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/rpc/EchoServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/rpc/EchoServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/binary/BinaryServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/binary/BinaryServiceTestCase.java
index 2ca662ec4e..2ca662ec4e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/binary/BinaryServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/binary/BinaryServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
index de5acc2fe7..de5acc2fe7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java
index a5f99d9737..a5f99d9737 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/CustomerServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/binary/BinaryService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/binary/BinaryService.java
index 4749383a0c..4749383a0c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/binary/BinaryService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/binary/BinaryService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/binary/BinaryServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/binary/BinaryServiceImpl.java
index aefbf64504..aefbf64504 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/binary/BinaryServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/binary/BinaryServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/customer/Customer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/customer/Customer.java
index 08506ebd48..08506ebd48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/customer/Customer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/customer/Customer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java
index 9d640376e7..9d640376e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/customer/CustomerService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java
index 70c718a656..70c718a656 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/customer/CustomerServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
index ca5d73246a..ca5d73246a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
index 2596637ce8..2596637ce8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java
index 7e579c6aba..7e579c6aba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/CurrencyConverter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/CurrencyConverter.java
index 45f8949633..45f8949633 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/CurrencyConverter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/CurrencyConverter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/CurrencyConverterImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/CurrencyConverterImpl.java
index 9956e207e1..9956e207e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/CurrencyConverterImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/CurrencyConverterImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
index 498576117b..498576117b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/Item.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/Item.java
index d5a298eee5..d5a298eee5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/Item.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/Item.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/Items.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/Items.java
index 82a995943d..82a995943d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/java/services/store/Items.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/java/services/store/Items.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/binary.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/binary.composite
index 821ae7fcbf..821ae7fcbf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/binary.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/binary.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/content/test.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/content/test.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/content/test.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/customer.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/customer.composite
index 7b33145afd..7b33145afd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/customer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/customer.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/echo.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/echo.composite
index b69107834a..b69107834a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/echo.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/echo.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/store.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/store.composite
index 7a87929985..7a87929985 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/store.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/store.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/test.composite
index 835633ac6d..835633ac6d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/testCache.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/testCache.composite
index 3401608c51..3401608c51 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest-runtime/src/test/resources/testCache.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest-runtime/src/test/resources/testCache.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/META-INF/MANIFEST.MF
index 767844f4ba..767844f4ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/pom.xml
index 331fa1d1e3..331fa1d1e3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
index dd01c37537..dd01c37537 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
index 38d68d532a..38d68d532a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
index 00d5584190..00d5584190 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
index f6acc6934e..f6acc6934e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelector.java
index aea3dce7ae..aea3dce7ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelectorFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelectorFactory.java
index bdd3eca740..bdd3eca740 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelectorFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelectorFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorFactoryImpl.java
index c47087e660..c47087e660 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorImpl.java
index ef214c3642..ef214c3642 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelector.java
index 7730a1e75e..7730a1e75e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelectorFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelectorFactory.java
index 27a56c374d..27a56c374d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelectorFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelectorFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorFactoryImpl.java
index 9e67f35bc0..9e67f35bc0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorImpl.java
index bca8218f8d..bca8218f8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormat.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormat.java
index d9136da58e..d9136da58e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormat.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormat.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatFactory.java
index f297320b39..f297320b39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatFactoryImpl.java
index 0ddeb8e557..0ddeb8e557 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatImpl.java
index 2ce3b95453..2ce3b95453 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormat.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormat.java
index 7eff067cdc..7eff067cdc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormat.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormat.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormatFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormatFactory.java
index 82d9ad6132..82d9ad6132 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormatFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormatFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatFactoryImpl.java
index b6fd3d6aed..b6fd3d6aed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatImpl.java
index 3f51fb8832..3f51fb8832 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java
index bd6b1dd7a2..bd6b1dd7a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory
index e228ebc528..e228ebc528 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.RESTBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelectorFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelectorFactory
index e108988ecf..e108988ecf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelectorFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelectorFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelectorFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelectorFactory
index 7da7b6bf0e..7da7b6bf0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelectorFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelectorFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormatFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormatFactory
index 8cc248c7d1..8cc248c7d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormatFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormatFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormatFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormatFactory
index 54d5635e59..54d5635e59 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormatFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormatFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index d88cba48f6..d88cba48f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java
index e808daff6d..e808daff6d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatProcessorTestCase.java
index b659ecd1a9..b659ecd1a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java
index 55a539044d..55a539044d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rest/src/test/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
index 8ee04bdf37..8ee04bdf37 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/pom.xml
index a30631b790..a30631b790 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
index 3cbc66f765..3cbc66f765 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
index 3b903cc846..3b903cc846 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
index 8d13b0a24f..8d13b0a24f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
index 7e343e4413..7e343e4413 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
index b351bfacc7..b351bfacc7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RemoteInterfaceGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 679543e0f2..679543e0f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
index cbc860ecc6..cbc860ecc6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
index cd7a0fd625..cd7a0fd625 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
index 89ea795529..89ea795529 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
index 461c176e1e..461c176e1e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldRmiService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
index 3b705d2c97..3b705d2c97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
index c3cd710f1d..c3cd710f1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/java/org/apache/tuscany/sca/binding/rmi/BindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
index 59e7606bbb..59e7606bbb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/resources/HelloWorldImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
index 819a00f978..819a00f978 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/resources/HelloWorldRmiImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
index 9d526b7f11..9d526b7f11 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi-runtime/src/test/resources/RMIBindingTest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/META-INF/MANIFEST.MF
index 66c1003087..66c1003087 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/pom.xml
index dcd7204168..dcd7204168 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
index 36354ddc01..36354ddc01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
index 38445fa838..38445fa838 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
index 1331ff4fb1..1331ff4fb1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
index df129319af..df129319af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
index b82480ba7a..b82480ba7a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rmi.RMIBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 31af0ec40f..31af0ec40f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/META-INF/MANIFEST.MF
index c78875e887..c78875e887 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/pom.xml
index 4ebacad2bf..4ebacad2bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
index 581ae59ae6..581ae59ae6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/Collection.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
index a2b83465da..a2b83465da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/MediaCollection.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
index 0912878938..0912878938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/collection/NotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
index e3a177198c..e3a177198c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
index 44c84ce5bb..44c84ce5bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
index e1bafdd3cd..e1bafdd3cd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
index d234a0c92c..d234a0c92c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
index 25ab939341..25ab939341 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e60dc2855a..e60dc2855a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
index 1ae4515e70..1ae4515e70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Consumer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
index af87155f45..af87155f45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
index a80f721136..a80f721136 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerClientImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
index 4b5bf373e7..4b5bf373e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/CustomerCollectionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
index 6dc23ac503..6dc23ac503 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/Provider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/RSSGetTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/RSSGetTestCase.java
index 346bf5fcc9..346bf5fcc9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/RSSGetTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/java/org/apache/tuscany/sca/binding/rss/RSSGetTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Consumer.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Consumer.composite
index 22141805cd..22141805cd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Consumer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Consumer.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Provider.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Provider.composite
index b2b1f3d776..b2b1f3d776 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Provider.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss-runtime/src/test/resources/org/apache/tuscany/sca/binding/rss/Provider.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/META-INF/MANIFEST.MF
index a0886018d3..a0886018d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/pom.xml
index 8233e1898c..8233e1898c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
index bda3210e73..bda3210e73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
index 3e691e636e..3e691e636e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/RSSBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
index a4e6a8283d..a4e6a8283d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
index 00abffafb5..00abffafb5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/java/org/apache/tuscany/sca/binding/rss/impl/RSSBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
index 73c47a3f41..73c47a3f41 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.rss.RSSBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index d298c16673..d298c16673 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-rss/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/META-INF/MANIFEST.MF
index 0732ffc0d7..0732ffc0d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/pom.xml
index 0494eed39f..0494eed39f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
index 4106158e54..4106158e54 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java
index a8fec07f5c..a8fec07f5c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
index ca90878633..ca90878633 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DelegatingSCAServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
index 331f152b50..331f152b50 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
index 393b8f400c..393b8f400c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
index 88c6888ba9..88c6888ba9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
index 14d7284846..14d7284846 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
index a0b976c7ad..a0b976c7ad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java
index 03aa44a04e..03aa44a04e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingMapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper
index 2719598883..2719598883 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 151c00eec8..151c00eec8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 86e3d1e829..86e3d1e829 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index ff378f8f32..ff378f8f32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index d968e2891d..d968e2891d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
index 895a551f79..895a551f79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index 93bd129a65..93bd129a65 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/resources/Calculator.composite
index 1847b2b452..1847b2b452 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
index da4219759f..da4219759f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
index 2ad383d9f7..2ad383d9f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/pom.xml
index 6d39922f90..6d39922f90 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
index 699846ead2..699846ead2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
index 04b46485d8..04b46485d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
index d4b3851d97..d4b3851d97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
index 3d73410ae9..3d73410ae9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
index ec4536c309..ec4536c309 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationServicePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
index ded09392ec..ded09392ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
index c13c009edf..c13c009edf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProvider.java
index a77f71b734..a77f71b734 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
index c4c93cd33d..c4c93cd33d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/configuration/Axis2ConfigParamPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/mtom/Axis2MTOMPolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/mtom/Axis2MTOMPolicyProvider.java
index e27da2bbd1..e27da2bbd1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/mtom/Axis2MTOMPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/mtom/Axis2MTOMPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/security/http/ssl/HTTPSPolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/security/http/ssl/HTTPSPolicyProvider.java
index 8355c0fa4e..8355c0fa4e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/security/http/ssl/HTTPSPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/security/http/ssl/HTTPSPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/security/http/ssl/HTTPSPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/security/http/ssl/HTTPSPolicyProviderFactory.java
index 592300aaa3..592300aaa3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/security/http/ssl/HTTPSPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/security/http/ssl/HTTPSPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BaseBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BaseBindingProvider.java
index 203d05c465..203d05c465 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BaseBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BaseBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BindingProviderFactory.java
index bd9b177c39..bd9b177c39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
index aa3e04a836..aa3e04a836 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
index 712eba0cea..712eba0cea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
index f427154c92..f427154c92 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
index ec6c610d76..ec6c610d76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java
index fe05824875..fe05824875 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInMessageReceiver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java
index 152b8f3689..152b8f3689 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceInOutSyncMessageReceiver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceProvider.java
index 1d62e88f22..1d62e88f22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceServlet.java
index 2f6b396786..2f6b396786 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyDispatcher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyDispatcher.java
index 0a20de5067..0a20de5067 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyDispatcher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyDispatcher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyListingAgent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyListingAgent.java
index c44454196d..c44454196d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyListingAgent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyListingAgent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java
index 7daa58bf29..7daa58bf29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/transport/TransportReferenceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 090b2550ea..090b2550ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index a35f2502f4..a35f2502f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index ae1acbd541..ae1acbd541 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
index fd56ea97a3..fd56ea97a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/conf/tuscany-axis2.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/conf/tuscany-axis2.xml
index 28fb6fac45..28fb6fac45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/conf/tuscany-axis2.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/conf/tuscany-axis2.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list
index e6e70dfd4b..e6e70dfd4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/rampart-1.4.mar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/rampart-1.4.mar
index ec870734a5..ec870734a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/rampart-1.4.mar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/rampart-1.4.mar
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list
index e69de29bb2..e69de29bb2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
index a482477d3b..a482477d3b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java
index b55779fa25..b55779fa25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java
index 54f25694e1..54f25694e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java
index addcf67ac0..addcf67ac0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLBindingWSATestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 98eb6e361b..98eb6e361b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 2c6c4fc92c..2c6c4fc92c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index 3662007984..3662007984 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
index fdbb68baea..fdbb68baea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
index 0d5fd064ae..0d5fd064ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbinding/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbinding/helloworld.composite
index 863d13b97e..863d13b97e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbinding/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbinding/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbindinguri/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbindinguri/helloworld.composite
index a877f9be26..a877f9be26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbindinguri/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbindinguri/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbindingwsa/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbindingwsa/helloworld.composite
index 7b0263b019..7b0263b019 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbindingwsa/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlbindingwsa/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/META-INF/MANIFEST.MF
index 2bde2fad22..2bde2fad22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/pom.xml
index 1dccd25613..1dccd25613 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java
index 21c284e592..21c284e592 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSBindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java
index 41dc8ba7b9..41dc8ba7b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
index b8efc2dcdd..b8efc2dcdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 452c9f2f5e..452c9f2f5e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 9a36d0e461..9a36d0e461 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/org/apache/tuscany/sca/binding/ws/jaxws/ri/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/org/apache/tuscany/sca/binding/ws/jaxws/ri/definitions.xml
index 1816348aa2..1816348aa2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/org/apache/tuscany/sca/binding/ws/jaxws/ri/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/main/resources/org/apache/tuscany/sca/binding/ws/jaxws/ri/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLPortTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLPortTestCase.java
index 80aa145098..80aa145098 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLPortTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLPortTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
index 98eb6e361b..98eb6e361b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
index 2c6c4fc92c..2c6c4fc92c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
index 3662007984..3662007984 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlport/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlport/helloworld.composite
index 9f74fc5c09..9f74fc5c09 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlport/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlport/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlport/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlport/helloworld.wsdl
index c5b59f1462..c5b59f1462 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws-ri/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlport/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws-ri/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/wsdlport/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/META-INF/MANIFEST.MF
index ac68264fcb..ac68264fcb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/pom.xml
index bc301c26e2..bc301c26e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
index 65bcc0cfd9..65bcc0cfd9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java
index 23e7d7d584..23e7d7d584 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
index c71dfdb8d8..c71dfdb8d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/pom.xml
index 330a579349..330a579349 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
index 3548c34c67..3548c34c67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
index 7509f2ab57..7509f2ab57 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
index 56fd02a611..56fd02a611 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLDefinitionGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
index 1a9b26d618..1a9b26d618 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLGenerationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
index 47cf44265f..47cf44265f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WSDLServiceGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java
index e30298db33..e30298db33 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/WebServiceBindingBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder
index e39d9352b3..e39d9352b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BindingBuilder
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
index 42fffcc44f..42fffcc44f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/main/resources/wsdlgen-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
index 7e6a1de546..7e6a1de546 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/Other.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
index f10a2286e6..f10a2286e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/other/package-info.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
index d147d85ef3..d147d85ef3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/BindingWSDLGeneratorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
index 33d5bea838..33d5bea838 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGeneratorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
index 1e4f802e01..1e4f802e01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
index da2c285bac..da2c285bac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFault.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
index 64cce0e49d..64cce0e49d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestFaultBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
index 3fd7361ae1..3fd7361ae1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaClass.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
index 69265c1528..69265c1528 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws-wsdlgen/src/test/java/org/apache/tuscany/sca/binding/ws/wsdlgen/TestJavaInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/META-INF/MANIFEST.MF
index 2ff6bb8547..2ff6bb8547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/pom.xml
index 7736d71aba..7736d71aba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
index 7288ece1b5..7288ece1b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
index 1ad38c69e4..1ad38c69e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
index a13584a3c2..a13584a3c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
index 055e2012dc..055e2012dc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
index 05e14155c1..05e14155c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
index 9051dc0af7..9051dc0af7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
index 7c07e94906..7c07e94906 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
index 88f173368d..88f173368d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
index 29fa81e2af..29fa81e2af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 75a0170373..75a0170373 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
index 2dfa5e6133..2dfa5e6133 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/main/resources/binding-wsxml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
index 85d41bd15c..85d41bd15c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
index 805b1862ce..805b1862ce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/java/org/apache/tuscany/sca/binding/ws/xml/WriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
index 2404e9ba28..2404e9ba28 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator-bad-wsdlElement.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
index 64965a689c..64965a689c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
index b86683b79a..b86683b79a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/CalculatorImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
index 1b6423be1d..1b6423be1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/PoliciedCalculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/example.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/invalid-stockquote.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/stockquote.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test1.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/test2.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/binding-ws/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/unwrapped-stockquote.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/META-INF/MANIFEST.MF
index f2f59a8ab7..f2f59a8ab7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/pom.xml
index 871e995ca4..871e995ca4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
index 4c5bca204b..4c5bca204b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/BindingURIBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
index 45020676ee..45020676ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
index a5ad40df86..a5ad40df86 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentPolicyBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
index c48d868105..c48d868105 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentReferenceBindingBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
index 9a74023504..9a74023504 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ComponentServiceBindingBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeCloneBuilderImpl.java
index 148a3b5368..148a3b5368 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
index 2ea35ffb9b..2ea35ffb9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
index 63864e5832..63864e5832 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
index ea459bf2fa..ea459bf2fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeWireApplierImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeWireApplierImpl.java
index 3167b8cdb6..3167b8cdb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeWireApplierImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeWireApplierImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
index 6c44d2e9e0..6c44d2e9e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
index 9938a054c5..9938a054c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/IntentValidator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/IntentValidator.java
index b2f7a4ceed..b2f7a4ceed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/IntentValidator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/IntentValidator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java
index 89fdc09ae1..89fdc09ae1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java
index 2417940b1c..2417940b1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
index e9a49c8842..e9a49c8842 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
index 7c2d86862b..7c2d86862b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/StructuralURIBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java
index 21725fb1b1..21725fb1b1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java
index 761f53ff11..761f53ff11 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
index f7b8a0374f..f7b8a0374f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
index 68b5787653..68b5787653 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java
index b3586a2346..b3586a2346 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/CompositeBuilderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/CompositeBuilderTestCase.java
index a99d0df91c..a99d0df91c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/CompositeBuilderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/MockPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/MockPolicy.java
index dac50ec227..dac50ec227 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/MockPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/MockPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentTestCase.java
index 9102257b77..9102257b77 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/TestPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/TestPolicyProcessor.java
index 1201b6e36f..1201b6e36f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/TestPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/TestPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
index 0e7aad877e..0e7aad877e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
index 584f27eea7..584f27eea7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite1.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
index 12cf984b88..12cf984b88 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite2.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
index e6be99195e..e6be99195e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite3.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
index 02167e43cf..02167e43cf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/Composite4.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
index 5b22d5b596..5b22d5b596 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.odg b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.odg
index a010bb1bf1..a010bb1bf1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.odg
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.odg
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.png b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.png
index e1f78f6423..e1f78f6423 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.png
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/scenario.png
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
index dc7f5c422c..dc7f5c422c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/builder/src/test/resources/org/apache/tuscany/sca/builder/impl/test_definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/META-INF/MANIFEST.MF
index 942e695a71..942e695a71 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/pom.xml
index 60c70500dd..60c70500dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java
index 248ea6eeb8..248ea6eeb8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPCacheContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPConstants.java
index 056e7f5f54..056e7f5f54 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPContentTypeMapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPContentTypeMapper.java
index 035e7c0fa6..035e7c0fa6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPContentTypeMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPContentTypeMapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPContext.java
index 3324be6ef1..3324be6ef1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPHeader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPHeader.java
index 40691dfd7f..40691dfd7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPHeader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPHeader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPUtil.java
index f810970869..f810970869 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-http/src/main/java/org/apache/tuscany/sca/common/http/HTTPUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/META-INF/MANIFEST.MF
index 5fd3a2a7f4..5fd3a2a7f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/pom.xml
index b965761a60..b965761a60 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/classloader/ClassLoaderDelegate.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/classloader/ClassLoaderDelegate.java
index 522880711c..522880711c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/classloader/ClassLoaderDelegate.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/classloader/ClassLoaderDelegate.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CollectionMap.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CollectionMap.java
index 0db80c891d..0db80c891d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CollectionMap.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CollectionMap.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundEnumeration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundEnumeration.java
index dc6a7e0f90..dc6a7e0f90 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundEnumeration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundEnumeration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundIterator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundIterator.java
index 997ba89881..997ba89881 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundIterator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/CompoundIterator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/LRUCache.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/LRUCache.java
index 41286aa0f9..41286aa0f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/LRUCache.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/collection/LRUCache.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/io/IOHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/io/IOHelper.java
index 91aef7a65f..91aef7a65f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/io/IOHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/io/IOHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelper.java
index ae4f01c032..ae4f01c032 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/main/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelperTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelperTestCase.java
index 11931a354f..11931a354f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/JavaIntrospectionHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/SubTestImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/SubTestImpl.java
index 77595f3281..77595f3281 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/SubTestImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/SubTestImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test1.java
index c7a25d95c2..c7a25d95c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test2.java
index 2b751af3eb..2b751af3eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/Test2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/TestImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/TestImpl.java
index 1bb7432b63..1bb7432b63 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/TestImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-java/src/test/java/org/apache/tuscany/sca/common/java/reflection/TestImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/META-INF/MANIFEST.MF
index 0025ccea7d..0025ccea7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/pom.xml
index 6bb98a6beb..6bb98a6beb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XMLDocumentHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XMLDocumentHelper.java
index 3bc24f8939..3bc24f8939 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XMLDocumentHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/XMLDocumentHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
index 304275beb7..304275beb7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/DOMHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/impl/SAX2DOMAdapter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/impl/SAX2DOMAdapter.java
index 11d692c81e..11d692c81e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/impl/SAX2DOMAdapter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/dom/impl/SAX2DOMAdapter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/sax/SAXHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/sax/SAXHelper.java
index dd22912b17..dd22912b17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/sax/SAXHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/sax/SAXHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
index d7c85f01b5..d7c85f01b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/StAXHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/StAX2SAXAdapter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/StAX2SAXAdapter.java
index df0fc069b6..df0fc069b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/StAX2SAXAdapter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/StAX2SAXAdapter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/XMLStreamSerializer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/XMLStreamSerializer.java
index 883199e4dd..883199e4dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/XMLStreamSerializer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/impl/XMLStreamSerializer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXMLStreamReader.java
index b0224b6ca5..b0224b6ca5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXmlNodeImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXmlNodeImpl.java
index faa56701ad..faa56701ad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXmlNodeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DOMXmlNodeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DelegatingNamespaceContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DelegatingNamespaceContext.java
index 8f136df7df..8f136df7df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DelegatingNamespaceContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/DelegatingNamespaceContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValueArrayStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValueArrayStreamReader.java
index ec3b6e083b..ec3b6e083b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValueArrayStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValueArrayStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValuePairStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValuePairStreamReader.java
index 4abf9b3dcf..4abf9b3dcf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValuePairStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NameValuePairStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamedProperty.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamedProperty.java
index dc5954f541..dc5954f541 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamedProperty.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamedProperty.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamespaceContextImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamespaceContextImpl.java
index b35c6456e1..b35c6456e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamespaceContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NamespaceContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NilElementStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NilElementStreamReader.java
index cee70f64df..cee70f64df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NilElementStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/NilElementStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/SimpleXmlNodeImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/SimpleXmlNodeImpl.java
index 30f388543c..30f388543c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/SimpleXmlNodeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/SimpleXmlNodeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/WrappingXMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/WrappingXMLStreamReader.java
index 896f4b5b71..896f4b5b71 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/WrappingXMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/WrappingXMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLDocumentStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLDocumentStreamReader.java
index a020a8a61e..a020a8a61e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLDocumentStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLDocumentStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReader.java
index 95ede0a840..95ede0a840 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReaderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReaderImpl.java
index 4fd70bea67..4fd70bea67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReaderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLFragmentStreamReaderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLStreamable.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLStreamable.java
index f433753f96..f433753f96 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLStreamable.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XMLStreamable.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNode.java
index 9e39f58b31..9e39f58b31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNodeIterator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNodeIterator.java
index e0eba9a35d..e0eba9a35d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNodeIterator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlNodeIterator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderImpl.java
index 3c4c1bdb06..3c4c1bdb06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XMLCharHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XMLCharHelper.java
index ea659ce344..ea659ce344 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XMLCharHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XMLCharHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
index a65bd5fe15..a65bd5fe15 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/main/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/dom/DOMHelperTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/dom/DOMHelperTestCase.java
index 176ea35c1c..176ea35c1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/dom/DOMHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/dom/DOMHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
index 77f060b081..77f060b081 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/StAXHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderTestCase.java
index 264c1a0d61..264c1a0d61 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/stax/reader/XmlTreeStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelperTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelperTestCase.java
index a2922e9173..a2922e9173 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/java/org/apache/tuscany/sca/common/xml/xpath/XPathHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.wsdl
index d7274f64af..d7274f64af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.xsd
index 903d419720..903d419720 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/common-xml/src/test/resources/org/apache/tuscany/sca/common/xml/stax/test.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/META-INF/MANIFEST.MF
index fdebec4d1c..fdebec4d1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/pom.xml
index 1900f08e21..1900f08e21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
index 3f82f6fb17..3f82f6fb17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java
index af13d2ee98..af13d2ee98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
index 111f1f370c..111f1f370c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
index 0b0d49de3e..0b0d49de3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
index 7958eb4b6d..7958eb4b6d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
index 3963968940..3963968940 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 87c2208e40..87c2208e40 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner
index 5c26e07e0c..5c26e07e0c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/META-INF/MANIFEST.MF
index 5ba88ca08f..5ba88ca08f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/pom.xml
index 17e7f20dcc..17e7f20dcc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
index 238cc8c2fa..238cc8c2fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Artifact.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
index 81b0b08b9d..81b0b08b9d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContentType.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
index 777ba1f986..777ba1f986 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Contribution.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
index 5937d535d0..5937d535d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
index a62d7155c9..a62d7155c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/ContributionMetadata.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
index 98954c288a..98954c288a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultContributionFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
index b2eddb8336..b2eddb8336 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultExport.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
index 4b3d157554..4b3d157554 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/DefaultImport.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
index a6e5afe7b8..a6e5afe7b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Export.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
index 450476b79b..450476b79b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/Import.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
index c6c0aff737..c6c0aff737 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/PackageType.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
index a362e97fc6..a362e97fc6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ArtifactImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
index 64bfb20bed..64bfb20bed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
index c31763151d..c31763151d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
index e2397c6f26..e2397c6f26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/ContributionMetadataImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
index d4614e5427..d4614e5427 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultExportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
index 7ab535f916..7ab535f916 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/impl/DefaultImportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
index 886c61c00a..886c61c00a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/DefaultJavaImportExportFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
index 41e93ec148..41e93ec148 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaExport.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
index d3568f6283..d3568f6283 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImport.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
index ee94d889ad..ee94d889ad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/JavaImportExportFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
index 955bb82ce4..955bb82ce4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassLoaderModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
index 25b3eae350..25b3eae350 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
index be175d000e..be175d000e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ContributionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
index c0bd9465e4..c0bd9465e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
index 9b02ce4abb..9b02ce4abb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
index bfa89d02fe..bfa89d02fe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
index 3bf9e54774..3bf9e54774 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportExportFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
index f2fdb3278e..f2fdb3278e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
index 344e730bdc..344e730bdc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
index a199f6874c..a199f6874c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
index a71fa61a54..a71fa61a54 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/DefaultNamespaceImportExportFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
index c68aee8521..c68aee8521 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceExport.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
index c452b15ee9..c452b15ee9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImport.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
index cfbac8bb1f..cfbac8bb1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/NamespaceImportExportFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
index 99af328964..99af328964 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
index 7bf3c32c93..7bf3c32c93 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
index 0d410fb377..0d410fb377 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
index 1146e593a9..1146e593a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportExportFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
index 35e2d539d4..35e2d539d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
index 17b0dc3953..17b0dc3953 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
index 9ac3aebaf6..9ac3aebaf6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
index 82902a11fe..82902a11fe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
index 93cb8c7fc7..93cb8c7fc7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
index ced2ad1899..ced2ad1899 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionReadException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
index af42c25734..af42c25734 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionResolveException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
index 9db6292e3d..9db6292e3d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionRuntimeException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
index 4e1cd287bb..4e1cd287bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ContributionWriteException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
index c871e4c868..c871e4c868 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
index 151edeae0b..151edeae0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
index e76d6cb299..e76d6cb299 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultStAXAttributeProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
index e22d7762fa..e22d7762fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultURLArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
index 59fa5990d6..59fa5990d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidatingXMLInputFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
index 4cb83cd5ef..4cb83cd5ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultValidationSchemaExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedArtifactProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedArtifactProcessor.java
index ca579110ae..ca579110ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedURLArtifactProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedURLArtifactProcessor.java
index 2639a21e41..2639a21e41 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedURLArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtendedURLArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
index 132b7a8858..132b7a8858 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
index aa159ac629..aa159ac629 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXAttributeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
index 77940df5aa..77940df5aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ProcessorContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ProcessorContext.java
index 75cfab4924..75cfab4924 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ProcessorContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ProcessorContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
index cbdb5c38a0..cbdb5c38a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
index a5c66bc1ee..a5c66bc1ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
index e9fca5fc4c..e9fca5fc4c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
index dbc0a2c7bc..dbc0a2c7bc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXAttributeProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
index 035a753649..035a753649 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
index e5b3492767..e5b3492767 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java
index 4c6f0b7282..4c6f0b7282 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnrecognizedElementException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java
index 8a166e42f0..8a166e42f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedContentTypeException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java
index ce94cef6a0..ce94cef6a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/UnsupportedPackageTypeException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
index 0ad8259287..0ad8259287 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLInputFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index 6de25d4eeb..6de25d4eeb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
index 67ec55b72e..67ec55b72e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidationSchemaExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
index 232bf9c72f..232bf9c72f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/ContributionContentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
index f589c6b911..f589c6b911 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyAttributeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
index db4feeec48..db4feeec48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
index fa91784a1b..fa91784a1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
index e17dd176a6..e17dd176a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultDelegatingModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
index 7745253bba..7745253bba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
index 8a11cb42f8..8a11cb42f8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
index 94b2fb0058..94b2fb0058 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
index a1eb85edca..a1eb85edca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
index 72e4b03c7f..72e4b03c7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
index c0267261f4..c0267261f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
index 4a25059792..4a25059792 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ModelResolverExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
index bcf146cbfe..bcf146cbfe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
index dfe8f08719..dfe8f08719 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResourceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
index 91697111af..91697111af 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScanner.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
index 1ca9def4ea..1ca9def4ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/ContributionScannerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
index c5aed5ccd3..c5aed5ccd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/DefaultContributionScannerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
index 04334492d1..04334492d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/DirectoryContributionScanner.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/JarContributionScanner.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/JarContributionScanner.java
index 25be92c310..25be92c310 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/JarContributionScanner.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/scanner/impl/JarContributionScanner.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
index 0ad3ecbd4d..0ad3ecbd4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionGeneratedMetadataDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
index 30220901a0..30220901a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
index 823684f422..823684f422 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
index 916630939e..916630939e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
index 8fc5aac46f..8fc5aac46f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.ContributionFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
index 6abfa4f978..6abfa4f978 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.java.JavaImportExportFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
index 7c86815365..7c86815365 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.namespace.NamespaceImportExportFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bbc1421599..bbc1421599 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
index fdd96edc20..fdd96edc20 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
index d18c8e1b5f..d18c8e1b5f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
index eef775786c..eef775786c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 67b610963e..67b610963e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
index 970186b696..970186b696 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory
index cd9bf88b23..cd9bf88b23 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
index b43db516df..b43db516df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 581391bbfe..581391bbfe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
index f54f5c3546..f54f5c3546 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
index a5186c3c6c..a5186c3c6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScannerExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/contribution-java-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/contribution-java-validation-messages.properties
index 09fc3e9fff..09fc3e9fff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/contribution-java-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/contribution-java-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties
index c1cbd06e7f..c1cbd06e7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/contribution-namespace-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/contribution-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/contribution-validation-messages.properties
index 63c4746a4d..63c4746a4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/contribution-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/contribution-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties
index d92df203e6..d92df203e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/main/resources/contribution-xml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
index 8409dd9491..8409dd9491 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/ContributionClassLoaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
index 25c4b91eaa..25c4b91eaa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaExportProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
index e9bfa4b5f3..e9bfa4b5f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/java/impl/JavaImportProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
index 384892ce62..384892ce62 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceExportProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
index 32f95e86ab..32f95e86ab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/namespace/impl/NamespaceImportProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
index 9587d3c024..9587d3c024 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/processor/URLartifactProcessorExtensionPointTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
index 58d1616aa2..58d1616aa2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
index 7692c8ecdf..7692c8ecdf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolverTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
index c04d56cafe..c04d56cafe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/resolver/TestModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
index 1e4dcd8023..1e4dcd8023 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/resources/deployables/sample-calculator.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/resources/deployables/sample-calculator.jar
index 0ca3a1b781..0ca3a1b781 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/resources/deployables/sample-calculator.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/resources/deployables/sample-calculator.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/resources/repository/sample-calculator.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/resources/repository/sample-calculator.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/resources/test.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/resources/test.composite
index 1e09549194..1e09549194 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/contribution/src/test/resources/test.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/contribution/src/test/resources/test.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/META-INF/MANIFEST.MF
index fe68b72498..fe68b72498 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/pom.xml
index 5474827c99..5474827c99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index 01a3c1813c..01a3c1813c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
index a5526ab031..a5526ab031 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/WrapperJavaInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index 4997a872ba..4997a872ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Collection2CollectionTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Collection2CollectionTransformer.java
index dcd3c3fda3..dcd3c3fda3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Collection2CollectionTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Collection2CollectionTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index e78610cce0..e78610cce0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index 2efc3578bd..2efc3578bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Map2MapTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Map2MapTransformer.java
index 5be7ba1da4..5be7ba1da4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Map2MapTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Map2MapTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 71dcc654eb..71dcc654eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index 0e615519f1..0e615519f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index de29088c1d..de29088c1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index 44e5072e61..44e5072e61 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index a1f5d37ff3..a1f5d37ff3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
index 875814fccc..875814fccc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
index dfd86a3a53..dfd86a3a53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/META-INF/MANIFEST.MF
index 1ae10356d5..1ae10356d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/pom.xml
index 26bb0bdb22..26bb0bdb22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/doc/Context Model.emx b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/doc/Context Model.emx
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index 2a690dbf0d..2a690dbf0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
index 23a50e5f22..23a50e5f22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index ddcc46a1ac..ddcc46a1ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 50882c9498..50882c9498 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index 5b91db124c..5b91db124c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 4475427d4b..4475427d4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java
index d6237b7ce3..d6237b7ce3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ThreadMessageContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index 42954555b1..42954555b1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 579e0c3da9..579e0c3da9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 69309f6dd0..69309f6dd0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index cadd876aa9..cadd876aa9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 711c09728b..711c09728b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index 8bb81b7eda..8bb81b7eda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
index f77a662779..f77a662779 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/PhasedInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java
index 222ba62fb6..222ba62fb6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ConfigAttributes.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3887db4873..3887db4873 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
index d4fcc0e8fc..d4fcc0e8fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BasePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java
index 5f2e6bd315..5f2e6bd315 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 36e34c11b7..36e34c11b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 6aad6786e3..6aad6786e3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java
index a25814234a..a25814234a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java
index 209b057859..209b057859 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/EndpointReferenceProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 4e9fddb135..4e9fddb135 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index cfb06d9c70..cfb06d9c70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
index c0346780d8..c0346780d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
index 43ea8d171b..43ea8d171b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/OperationSelectorProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index de0b62eecd..de0b62eecd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index 134df1c37e..134df1c37e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index 75c5544aa3..75c5544aa3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index ab864dba3f..ab864dba3f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/RuntimeProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/RuntimeProvider.java
index 2afd44af31..2afd44af31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/RuntimeProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/RuntimeProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e7df45bfa8..e7df45bfa8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
index 674b708ef8..674b708ef8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
index 3f629ddeef..3f629ddeef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java
index b015891e93..b015891e93 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ActivationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
index 4f6a29bbcc..4f6a29bbcc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
index 4688bea66f..4688bea66f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseEndpointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
index d9bdc2b6f6..d9bdc2b6f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/CompositeActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultDomainRegistryFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultDomainRegistryFactoryExtensionPoint.java
index f74d80b882..f74d80b882 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultDomainRegistryFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultDomainRegistryFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 283d1d1a8b..283d1d1a8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
index c79fab1f47..c79fab1f47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java
index f1582c3d70..f1582c3d70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java
index e6e6d3773d..e6e6d3773d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistryURI.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
index 13d193c464..13d193c464 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
index b2ce3f5b7b..b2ce3f5b7b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReferenceBinder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
index 2c01eb115a..2c01eb115a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
index 981872fdfa..981872fdfa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointSerializer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
index d1d0fb2b29..d1d0fb2b29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ExtensibleDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
index 2df1761aec..2df1761aec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Invocable.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 928c77fd04..928c77fd04 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index efc4b278b3..efc4b278b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 861ca2d6f9..861ca2d6f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 8abecee0bf..8abecee0bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 1eefdc978e..1eefdc978e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
index 6712b71efd..6712b71efd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
index 43ca56839e..43ca56839e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeEndpointReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeProperties.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeProperties.java
index 6b538ad172..6b538ad172 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeProperties.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeProperties.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index 997e170b22..997e170b22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java
index 6060910a17..6060910a17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/Version.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index d32af450ff..d32af450ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index 2c5fb556bc..2c5fb556bc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index 18ec2dfeaa..18ec2dfeaa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
index 454d1796cc..454d1796cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index 19cf2a444f..19cf2a444f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint
index be585a1e03..be585a1e03 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 1ab308cc71..1ab308cc71 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties
index 9018bd1a1b..9018bd1a1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/main/resources/org/apache/tuscany/sca/runtime/revision.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
index 6486a5ed4f..6486a5ed4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java
index 8ac2c3ceb8..8ac2c3ceb8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/ConfigURITestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java
index 8a534299ca..8a534299ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core-spi/src/test/java/org/apache/tuscany/sca/runtime/VersionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/META-INF/MANIFEST.MF
index 62fc183f20..62fc183f20 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/pom.xml
index 01b10b57a1..01b10b57a1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index 790cc6ec98..790cc6ec98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
index e7d2d5d841..e7d2d5d841 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
index aa1a4001a4..aa1a4001a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
index 4e5275058e..4e5275058e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java
index b7d83e754a..b7d83e754a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/LocalDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
index 4d6a98ca5f..4d6a98ca5f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParameterProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
index 7bd56271a5..7bd56271a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
index 6032005b9a..6032005b9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
index 2eea60ccea..2eea60ccea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
index bc7e6df878..bc7e6df878 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
index d1c81ef8ee..d1c81ef8ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
index 9ef0d8e728..9ef0d8e728 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index 2de52bebb2..2de52bebb2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
index ace4dc48e1..ace4dc48e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultRequestContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
index 5206f0945e..5206f0945e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceExt.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
index 542a80f926..542a80f926 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallbackServiceReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
index 999854a822..999854a822 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
index cdb510f7ec..cdb510f7ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
index 5d6719bc81..5d6719bc81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
index 4b563b0079..4b563b0079 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/InstanceWrapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index 820faf6259..820faf6259 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index db10b6cff2..db10b6cff2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 400bb333fd..400bb333fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 588eaa2d15..588eaa2d15 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index a56983a5d3..a56983a5d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index fff3727d87..fff3727d87 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index cb2c01f7d6..cb2c01f7d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index af6f039775..af6f039775 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index 049c73f258..049c73f258 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 08019ec3e2..08019ec3e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index 6435efe4d6..6435efe4d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index f2d272757d..f2d272757d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 3e0bd7cb17..3e0bd7cb17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java
index 0751fd631b..0751fd631b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 489d06a3e1..489d06a3e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
index 67b1b923eb..67b1b923eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncJDKInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java
index 07086dfae3..07086dfae3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/AsyncResponse.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
index 8569af0de8..8569af0de8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
index 168af952db..168af952db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKCallbackInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
index d34d9c8638..d34d9c8638 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
index a162110835..a162110835 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
index 6ce2ffca21..6ce2ffca21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
index e66fb0567a..e66fb0567a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
index 45f4bf52bf..45f4bf52bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/NoMethodForOperationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
index 85ef79b5d7..85ef79b5d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManager.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
index 175f3463ad..175f3463ad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
index 7b0f50ebd0..7b0f50ebd0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/EndpointReferenceBinderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/RuntimePropertiesImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/RuntimePropertiesImpl.java
index 1bbb97d975..1bbb97d975 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/RuntimePropertiesImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/impl/RuntimePropertiesImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 4674456925..4674456925 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
index 2ea724ccf6..2ea724ccf6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/DefaultScopeRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 35da433af0..35da433af0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 7d34a0144b..7d34a0144b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index ee55917f2f..ee55917f2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index 98c5f84c71..98c5f84c71 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 5c85fead2c..5c85fead2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 89ddd7e538..89ddd7e538 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index 17afd36219..17afd36219 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
index 730f92e0f9..730f92e0f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
index f61e70a598..f61e70a598 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/CompositeScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
index 9884c5f053..9884c5f053 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/ScopeRegistryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
index 1235fd2a67..1235fd2a67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
index 5bf20a6a5f..5bf20a6a5f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/impl/StatelessScopeContainerFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
index 380ca818c5..380ca818c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/DefaultWorkScheduler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
index 1cd70c75de..1cd70c75de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManager.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
index ca06d0e854..ca06d0e854 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/Work.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
index 4580011806..4580011806 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkEvent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
index 0fc104d0fc..0fc104d0fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkItem.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
index 38bbaeebe0..38bbaeebe0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/java/org/apache/tuscany/sca/core/work/impl/WorkListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index e8ee318b6c..e8ee318b6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
index 51ed2449fb..51ed2449fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ComponentContextFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
index 70b17a2f00..70b17a2f00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.RequestContextFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 94c83ceeab..94c83ceeab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
index c6567aa904..c6567aa904 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
index 2aa000efc0..2aa000efc0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.scope.ScopeRegistry
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
index a21b75b570..a21b75b570 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator
index 0182f52086..0182f52086 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.CompositeActivator
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
index f2a6f0b4c3..f2a6f0b4c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder
index 61edf5111e..61edf5111e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointReferenceBinder
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer
index fb951e75d5..fb951e75d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointSerializer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeProperties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeProperties
index 66e0277d59..66e0277d59 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeProperties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeProperties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 90e887739a..90e887739a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/endpoint-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/endpoint-validation-messages.properties
index 6e12d11d68..6e12d11d68 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/main/resources/endpoint-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/main/resources/endpoint-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
index 1302bed681..1302bed681 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/InvocationChainImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
index 8fcead004d..8fcead004d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseManagerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
index c268e133e4..c268e133e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/impl/PhaseSorterTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
index 16ca5fd00e..16ca5fd00e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/FailingWork.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
index 2d791e5012..2d791e5012 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyFailingRunnable.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
index c0183b6f9b..c0183b6f9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnable.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
index 307f24aca7..307f24aca7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/JSR237MyRunnerListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
index 4ec0f55867..4ec0f55867 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/Jsr237WorkSchedulerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
index a452d6f371..a452d6f371 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TestWorkListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
index 122609d7e6..122609d7e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/ThreadPoolWorkManagerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
index f6435659ef..f6435659ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/core/work/impl/TimeDelayWork.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index ca7bf9b3d7..ca7bf9b3d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index ad23df3761..ad23df3761 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/META-INF/MANIFEST.MF
index a8b156bff2..a8b156bff2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/pom.xml
index 960d6e6d82..960d6e6d82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
index fa4da391a5..fa4da391a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
index f9ecd6c641..f9ecd6c641 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
index 37042c0895..37042c0895 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
index 229b29f5cd..229b29f5cd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
index 69512058b7..69512058b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
index 7f13db5228..7f13db5228 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/META-INF/MANIFEST.MF
index 545f8432ed..545f8432ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/pom.xml
index 5744008d6f..5744008d6f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
index 014a0f5223..014a0f5223 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
index cd820ab4b4..cd820ab4b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/AxiomHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
index f44297edb7..f44297edb7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Exception2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
index cede1c4689..cede1c4689 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Externalizable2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
index 947cd99a19..947cd99a19 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Exception.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
index f4bbea81cc..f4bbea81cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Externalizable.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
index ea40e61746..ea40e61746 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2Object.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
index 0fc2cfa8a3..0fc2cfa8a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2String.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
index e0da9ad428..e0da9ad428 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
index 9084f09dc0..9084f09dc0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElementWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
index 88d6b462c1..88d6b462c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/Object2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
index 4881eef105..4881eef105 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/String2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
index 173a9ab384..173a9ab384 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index f2b874e0e8..f2b874e0e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 70318b3930..70318b3930 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
index 951a0483cb..951a0483cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/test/java/org/apache/tuscany/sca/databinding/axiom/OMElementTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/test/resources/ipo.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/test/resources/ipo.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/test/resources/ipo.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/test/resources/ipo.xsd
index af1e73172d..af1e73172d 100755
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/test/resources/order.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/test/resources/order.wsdl
index 913d9e4928..913d9e4928 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-axiom/src/test/resources/order.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-axiom/src/test/resources/order.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
index 334906b75b..334906b75b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/pom.xml
index 729bc248d5..729bc248d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
index 93277e77bf..93277e77bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/AxiomHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
index c90a1c6d5a..c90a1c6d5a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXB2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
index 0dacce996f..0dacce996f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/JAXBDataSource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
index f7de7f4425..f7de7f4425 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/OMElement2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
index f30a6c1cb8..f30a6c1cb8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBCustomBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
index f6bd33864f..f6bd33864f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDSContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
index 5a5afc13cb..5a5afc13cb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/JAXBDataSourceExt.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
index 0a12654524..0a12654524 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/SourceDataSource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
index 44e34c3647..44e34c3647 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStreamWriterWithOS.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
index e8e3193e24..e8e3193e24 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/java/org/apache/tuscany/sca/databinding/jaxb/axiom/ext/XMLStringDataSource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index d1799abaff..d1799abaff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
index df2b6dc4e3..df2b6dc4e3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/JAXB2OMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
index abfcf358d2..abfcf358d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/test/java/org/apache/tuscany/databinding/jaxb/axiom/OMElement2JAXBTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/META-INF/MANIFEST.MF
index b0fb20a6de..b0fb20a6de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/pom.xml
index bf5afb82de..bf5afb82de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
index 57922e1c89..57922e1c89 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/AnyTypeXmlAdapter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
index 91cb39b0f2..91cb39b0f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DOMElementXmlAdapter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
index 35adffe23b..35adffe23b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DataConverter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
index 062da48206..062da48206 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/DefaultXMLAdapterExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
index 3d25af5b25..3d25af5b25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
index a0b6ff8237..a0b6ff8237 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
index 7ecca3a042..7ecca3a042 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXB2String.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
index 025b4f7c73..025b4f7c73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCache.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
index 50fc346270..50fc346270 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
index 5d7527cfa7..5d7527cfa7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
index 217345caba..217345caba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBPropertyDescriptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
index 84529752de..84529752de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
index 7473a8e56e..7473a8e56e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
index a1f4c12c8f..a1f4c12c8f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
index 5f90aa4d7a..5f90aa4d7a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
index e6fc1b4405..e6fc1b4405 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Node2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
index b063d9524f..b063d9524f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/Reader2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
index 9d0accefcc..9d0accefcc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/String2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
index 5fa98b5ed1..5fa98b5ed1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLAdapterExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
index d177d53eda..d177d53eda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLRootElementUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
index 9c3760b119..9c3760b119 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/XMLStreamReader2JAXB.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/package.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/package.html
index 3dd869384a..3dd869384a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/package.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/package.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 1447ed4e7f..1447ed4e7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 673e75d50c..673e75d50c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
index b8d185b468..b8d185b468 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
index 5c5c892f33..5c5c892f33 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/com/example/stock/StockQuoteOffer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
index 9dd5892f7c..9dd5892f7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBContextCacheTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
index ec414641c6..ec414641c6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBDataBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
index f5cff68969..f5cff68969 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBReflectionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
index 6e2a540ada..6e2a540ada 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
index 6037212e5a..6037212e5a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/JAXBWrapperHandlerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
index 9bdfb108fe..9bdfb108fe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
index b8e9ee7f7d..b8e9ee7f7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
index 5c511e6ccb..5c511e6ccb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
index 3c3992524a..3c3992524a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MyJaxbBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
index 62dfa6f73c..62dfa6f73c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/MySubBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
index 98aefed546..98aefed546 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/java/org/apache/tuscany/sca/databinding/jaxb/POJOTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/resources/ipo.xsd
index 04e8cb44f3..04e8cb44f3 100755
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-jaxb/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/LICENSE
index d645695673..d645695673 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/META-INF/MANIFEST.MF
index 42674a55f8..42674a55f8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/pom.xml
index 411345e9fa..411345e9fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
index a9edc66ae8..a9edc66ae8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2JavaBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
index 4577e7260e..4577e7260e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2String.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
index 4989f59143..4989f59143 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSON2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
index 1557c90bce..1557c90bce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
index 028690a789..028690a789 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
index 17ed06298e..17ed06298e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSON.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
index 9ec3bd7e19..9ec3bd7e19 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
index 7d89927f51..7d89927f51 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/String2JSON.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
index 76ccc69c55..76ccc69c55 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/XMLStreamReader2JSON.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
index c7c9adc882..c7c9adc882 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSON2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
index adc38772be..adc38772be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONBadgerfishDataSource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
index 5b0312056e..5b0312056e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/axiom/JSONDataSource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/InputStream2JSON.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/InputStream2JSON.java
index 57b9d55b44..57b9d55b44 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/InputStream2JSON.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/InputStream2JSON.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
index ca28ec5833..ca28ec5833 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2Object.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java
index 920485a540..920485a540 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
index ae3bb8fd48..ae3bb8fd48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
index 0948341b76..0948341b76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index aec4184afa..aec4184afa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 3590a46c47..3590a46c47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 6fb438eec7..6fb438eec7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
index 1aa6cf3dab..1aa6cf3dab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
index 3b36f5be74..3b36f5be74 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JavaBean2JSONTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
index 60b293c1d4..60b293c1d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
index d32e0763c7..d32e0763c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
index 3a2b95a4e2..3a2b95a4e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/MyInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
index fd0557d0a2..fd0557d0a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/POJOTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonTestCase.java
index 5254ca7742..5254ca7742 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSONTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSONTestCase.java
index b401e7012d..b401e7012d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSONTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSONTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/resources/ipo.xsd
index 5a493e1746..5a493e1746 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-json/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-json/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
index a40e93b8b8..a40e93b8b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/pom.xml
index 222854daa0..222854daa0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
index 02f43000b4..02f43000b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/AxiomHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
index d306290245..d306290245 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
index dc3c2610a4..dc3c2610a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
index 3a2391b41a..3a2391b41a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index c870ec2406..c870ec2406 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
index 57dd056526..57dd056526 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
index 901217a58e..901217a58e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
index 5015a1b697..5015a1b697 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/META-INF/MANIFEST.MF
index 98ea88ea0f..98ea88ea0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/pom.xml
index 2fcc3e39bb..2fcc3e39bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
index 80f4602fac..80f4602fac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
index eaaf153dd5..eaaf153dd5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2String.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
index 7d66810ca0..7d66810ca0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
index d59698cdb3..d59698cdb3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDO.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
index 117d61ff26..117d61ff26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
index a7fc9aeb5c..a7fc9aeb5c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/Node2DataObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
index 23063317e7..23063317e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
index 0003e7d46f..0003e7d46f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDODataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
index 7e26990b32..7e26990b32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOSimpleTypeMapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
index 381249d9bb..381249d9bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
index 7e432dd2c2..7e432dd2c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOTypes.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
index 58c69858b7..58c69858b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
index a48e357960..a48e357960 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/String2DataObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
index d73f714384..d73f714384 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2String.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
index 2f41fb1957..2f41fb1957 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
index fbc13e6fed..fbc13e6fed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2DataObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
index 658fe115a5..658fe115a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/XMLStreamReader2XMLDocument.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
index f9d66bf04e..f9d66bf04e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
index 76e2955f06..76e2955f06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/xml/SDOTypesProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 27fa6e85ad..27fa6e85ad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 6252de51c2..6252de51c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index 5ae557cc74..5ae557cc74 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index b1916fd32a..b1916fd32a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
index f53f08f377..f53f08f377 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/main/resources/databinding-sdo-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
index 5a0208b290..5a0208b290 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/com/example/stock/sdo/fault/InvalidSymbolFault_Exception.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
index 012af9ed1c..012af9ed1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2NodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
index 44d11cd586..44d11cd586 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2StringTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
index c2a9f46059..c2a9f46059 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/DataObject2XMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
index 1fcae3cb73..1fcae3cb73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/ImportSDOProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
index e0d1c9bf12..e0d1c9bf12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOContextHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
index 400b424a97..400b424a97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDODataBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
index 4d415f2895..4d415f2895 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOTransformerTestCaseBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
index 2326d1b93b..2326d1b93b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/SDOWrapperHandlerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
index 3f742b49a3..3f742b49a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/TestModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
index 2beadc5b61..2beadc5b61 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/java/org/apache/tuscany/sca/databinding/sdo/XMLDocument2XMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/resources/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/resources/ipo.xsd
index 241ec15d36..241ec15d36 100755
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/resources/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/resources/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/resources/stock.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/resources/stock.xsd
index a0a6717371..a0a6717371 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/resources/stock.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/resources/stock.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/resources/wrapper.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/resources/wrapper.xml
index 2526629409..2526629409 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/resources/wrapper.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/resources/wrapper.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/resources/wrapper.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/resources/wrapper.xsd
index ea4dc5f7f3..ea4dc5f7f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding-sdo/src/test/resources/wrapper.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding-sdo/src/test/resources/wrapper.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/LICENSE
index 616bec99ed..616bec99ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/META-INF/MANIFEST.MF
index 8fed859030..8fed859030 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/pom.xml
index 69a567cdc9..69a567cdc9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseDataBinding.java
index aa019ebdcf..aa019ebdcf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseTransformer.java
index f5b92de2fb..f5b92de2fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/BaseTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
index fd5cf4ac1d..fd5cf4ac1d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingContext.java
index c77d0ad0f6..c77d0ad0f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
index ff3afd8181..ff3afd8181 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBindingExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
index 505a810276..505a810276 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipe.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
index 1aac6d48be..1aac6d48be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataPipeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
index 22b6e8646e..22b6e8646e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultDataBindingExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
index 39889b1e97..39889b1e97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DefaultTransformerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
index e768c60030..e768c60030 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Mediator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
index b65d392393..b65d392393 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PullTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
index 600a6477f6..600a6477f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/PushTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
index 6f2795fb51..6f2795fb51 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/SimpleTypeMapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
index 64740b8e08..64740b8e08 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
index f32465d63a..f32465d63a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
index 2aa0ad7c15..2aa0ad7c15 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/Transformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
index ee7efe4860..ee7efe4860 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/TransformerExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
index 4d32b41d4c..4d32b41d4c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/WrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
index 19e1f7e13f..19e1f7e13f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
index 4405077e29..4405077e29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
index 650e909c61..650e909c61 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/annotation/DataType.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
index 2c14d4c380..2c14d4c380 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/externalizable/ExternalizableDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
index a551671452..a551671452 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/DirectedGraph.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
index d4d0312bc0..d4d0312bc0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Group2GroupTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
index 1c7220fa67..1c7220fa67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/GroupDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
index f6e8e53459..f6e8e53459 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/Java2SimpleTypeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
index 5227b95432..5227b95432 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/MediatorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
index a1a89005b3..a1a89005b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/PipedTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
index a7849498b4..a7849498b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleType2JavaTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
index 16eb4b42ed..16eb4b42ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/SimpleTypeMapperImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
index 7af63f1ad6..7af63f1ad6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/TransformationContextImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
index 0664902feb..0664902feb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/XSDDataTypeConverter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
index fbca9b0444..fbca9b0444 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/DOMNode2JavaBeanTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
index 5dc13bd60b..5dc13bd60b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/Java2XMLMapperException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
index f582499b70..f582499b70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2DOMNodeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
index 43bda3d769..43bda3d769 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLStreamReaderTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
index 28d716e4f7..28d716e4f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBean2XMLTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
index 5e5774f338..5e5774f338 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaBeansDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
index 6886462ac8..6886462ac8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/JavaExceptionDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
index a1bb7e6235..a1bb7e6235 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/SimpleJavaDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
index 6881ec6038..6881ec6038 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaBeanTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
index ae06d68e67..ae06d68e67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/javabeans/XML2JavaMapperException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
index 847fcf226c..847fcf226c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/util/DataTypeHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
index ed59911a0b..ed59911a0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
index b21a531c53..b21a531c53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
index 4ce5dc6c69..4ce5dc6c69 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/DOMWrapperHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
index 0bb0513011..0bb0513011 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
index b0b5d336f0..b0b5d336f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputSource2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
index c9183c4cbf..c9183c4cbf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
index f762122350..f762122350 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/InputStream2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
index 25ed70dda5..25ed70dda5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2OutputStream.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
index d5bf7e76b5..d5bf7e76b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SimpleJavaType.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
index cb33d3548a..cb33d3548a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2SourceTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
index fb3023345c..fb3023345c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2String.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
index 6c1d241ce9..6c1d241ce9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2Writer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
index 2e0612b9b7..2e0612b9b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Node2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
index 1866f3864a..1866f3864a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
index 396038ec08..396038ec08 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Reader2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
index 9bc5f99304..9bc5f99304 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SAX2DOMPipe.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
index 0bb13bb3ea..0bb13bb3ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/SimpleJavaType2Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
index d2fb8305e8..d2fb8305e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2NodeTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
index dd69e3ea66..dd69e3ea66 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2ResultTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
index 0c3db2a477..0c3db2a477 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Source2StringTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
index f8ae31b96c..f8ae31b96c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StAXDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
index 38f8327ae4..38f8327ae4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/StreamDataPipe.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
index cfcbce2e12..cfcbce2e12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
index 461adbe938..461adbe938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
index 31093b8587..31093b8587 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2SourceTransformer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
index 156e15d8c5..156e15d8c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/String2XMLStreamReader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
index 0544631a73..0544631a73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/Writer2ReaderDataPipe.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
index f7c895db1e..f7c895db1e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLGroupDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
index f8f21736ba..f8f21736ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
index 11dc23e4b6..11dc23e4b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2SAX.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
index 64c93d74a0..64c93d74a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStreamReader2String.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
index b360b5b9a8..b360b5b9a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index ef8a825d68..ef8a825d68 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
index 4cad1181b7..4cad1181b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBindingExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
index c91908e630..c91908e630 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.Mediator
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index 9f609be7e2..9f609be7e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
index 6c04591a1f..6c04591a1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PushTransformer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper
index f905a9aa7b..f905a9aa7b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.SimpleTypeMapper
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
index 07762a14b8..07762a14b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.TransformerExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
index defa62a49e..defa62a49e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
index 562c22354c..562c22354c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/SimpleTypeMapperExtensionTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
index 243ac71201..243ac71201 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
index a337dc113c..a337dc113c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/XSDDataTypeConverterTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
index c5d6dbbcc1..c5d6dbbcc1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DataBindingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
index 9ab2b51c95..9ab2b51c95 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/DirectedGraphTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
index 953e539dd1..953e539dd1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/MediatorImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
index e240592adf..e240592adf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/impl/XMLDocumentStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
index 95f21ff4c9..95f21ff4c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/BeanXMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
index 27d111374a..27d111374a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DOM2StAXTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
index da18a4f89c..da18a4f89c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/DataPipeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
index 8919453731..8919453731 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/JavaBean2XMLStreamReaderTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
index 75c43dbf79..75c43dbf79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/Node2StringTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
index 5027f64f01..5027f64f01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/PushTransformationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
index 6fd8ce2e8b..6fd8ce2e8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/xml/TraxTransformerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
index 92a576fb98..92a576fb98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
index f011ca9f32..f011ca9f32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/order.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
index 0ba8ade1e0..0ba8ade1e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/xml/foo.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/META-INF/MANIFEST.MF
index 58d085ce87..58d085ce87 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/pom.xml
index 313464cda3..313464cda3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java
index 42c7596b15..42c7596b15 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/DefaultDeployer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
index 9c5d19816c..9c5d19816c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java
index 8180ac6465..8180ac6465 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/Contributions.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
index ecf2adfb85..ecf2adfb85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer
index 46e6eba7f7..46e6eba7f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/resources/META-INF/services/org.apache.tuscany.sca.deployment.Deployer
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties
index 0c07a3a30f..0c07a3a30f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/main/resources/org/apache/tuscany/sca/deployment/impl/deployer-impl-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/java/hello/deployer/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorld.java
index 2480a5e4d9..2480a5e4d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/java/hello/deployer/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java
index fc81dc2167..fc81dc2167 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/java/hello/deployer/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
index e5c0a499a8..e5c0a499a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/java/org/apache/tuscany/sca/deployment/impl/DeployerImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
index 5dc99a46a7..5dc99a46a7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
index 23555ea491..23555ea491 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/deployment/src/test/resources/org/apache/tuscany/sca/deployment/impl/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/META-INF/MANIFEST.MF
index e9fb88b202..e9fb88b202 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/pom.xml
index 524c1e07cc..524c1e07cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
index e538ea9f53..e538ea9f53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
index ac0672fb2c..ac0672fb2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java
index ee15dfba12..ee15dfba12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/itest/nodes/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java
index 3613cce9d2..3613cce9d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/GetServiceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
index a000b686b4..a000b686b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
index d6009f5230..d6009f5230 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
index bd1583065b..bd1583065b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar
index 3e9ae79a41..3e9ae79a41 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar
index 40333cab75..40333cab75 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/domain-node/src/test/resources/itest-nodes-helloworld-service-2.0-SNAPSHOT.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/META-INF/MANIFEST.MF
index ea13b89d17..ea13b89d17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/pom.xml
index 7f4ef59f00..7f4ef59f00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
index ad4d6d9e64..ad4d6d9e64 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
index 78b06f0adc..78b06f0adc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
index b15ea6a58f..b15ea6a58f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/META-INF/MANIFEST.MF
index 9680bb9038..9680bb9038 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/pom.xml
index 901c07bae7..901c07bae7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
index 110982a1bd..110982a1bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
index 420bcfa3a2..420bcfa3a2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
index c6b1ccaa21..c6b1ccaa21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
index 23551701a5..23551701a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java
index c4391e59bb..c4391e59bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java
index edfe186667..edfe186667 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/META-INF/MANIFEST.MF
index 06df55ef38..06df55ef38 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/pom.xml
index 8003295220..8003295220 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/AbstractReplicatedMap.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/AbstractReplicatedMap.java
index fe683af025..fe683af025 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/AbstractReplicatedMap.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/AbstractReplicatedMap.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/DisableMcastInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/DisableMcastInterceptor.java
index 4c311e36b3..4c311e36b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/DisableMcastInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/DisableMcastInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/MapStore.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/MapStore.java
index 9e540743bf..9e540743bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/MapStore.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/MapStore.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
index 5dc627d88d..5dc627d88d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedMap.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedMap.java
index 669ad82192..669ad82192 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedMap.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedMap.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java
index 91314b4c37..91314b4c37 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/TribesDomainRegistryFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
index 734afb2ac5..734afb2ac5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java
index c0321ef3a0..c0321ef3a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/MultiRegTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
index 993562c1eb..993562c1eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/endpoint-tribes/src/test/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/META-INF/MANIFEST.MF
index 7ece048182..7ece048182 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/NOTICE
index a67cd7c175..a67cd7c175 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/pom.xml
index c93aa3a20c..c93aa3a20c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
index 6736f9cfb4..6736f9cfb4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
index 14ad6670a8..14ad6670a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
index 4b5fffff01..4b5fffff01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
index aa9cd50abc..aa9cd50abc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
index 0b0e46fd15..0b0e46fd15 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
index 566cd6e1a5..566cd6e1a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar
index 61c7b5a49e..61c7b5a49e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar
index b02c368c58..b02c368c58 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/META-INF/MANIFEST.MF
index 9bead3ab7d..9bead3ab7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/NOTICE
index 1fda3f942e..1fda3f942e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/pom.xml
index c921674364..c921674364 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index e1f9ac6ddd..e1f9ac6ddd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
index 1c49ea4ee4..1c49ea4ee4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
index 99792d0215..99792d0215 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultModuleActivatorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
index 40e4635d77..40e4635d77 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/DefaultUtilityExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 8f9ab7ed3e..8f9ab7ed3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
index c3d2fd282a..c3d2fd282a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/FactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
index ca92cb8129..ca92cb8129 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/LifeCycleListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index ddc9a6981c..ddc9a6981c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
index 7070d33f2c..7070d33f2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/ModuleActivatorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
index 7acc7fc409..7acc7fc409 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/core/UtilityExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
index f15e89767c..f15e89767c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClassLoaderContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
index eec4ff1734..eec4ff1734 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
index 47a91aabfe..47a91aabfe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclaration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
index f546e44dfb..f546e44dfb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDeclarationParser.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
index aebd6cd3de..aebd6cd3de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscoverer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
index f99f682e07..f99f682e07 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
index 7f38aa6d06..7f38aa6d06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java
index d052d6b10f..d052d6b10f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/ClassLoaderDelegate.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java
index 77f6f3e8db..77f6f3e8db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/InvalidSyntaxException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
index 8d3630baa4..8d3630baa4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/impl/LDAPFilter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
index be22b6fb13..be22b6fb13 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.FactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
index 4e5a05d522..4e5a05d522 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivatorExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
index 52d7cb59b2..52d7cb59b2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.UtilityExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
index c0aac21596..c0aac21596 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscovererTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
index 9758cba3b4..9758cba3b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultExtensionPointRegistryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
index 0a5f4d6442..0a5f4d6442 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/DefaultUtilityExtensionPointTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
index e13a47cc1b..e13a47cc1b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceDiscoveryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
index 7920fdf4f4..7920fdf4f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/ServiceHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java
index f1ed50c5f2..f1ed50c5f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/DummyImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java
index 6a1ba4d7ba..6a1ba4d7ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/Test2Impl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java
index 4def8a5227..4def8a5227 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java
index 2f0c34df7d..2f0c34df7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/java/org/apache/tuscany/sca/extensibility/test/TestInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface
index 12991071e5..12991071e5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/extensibility/src/test/resources/META-INF/services/org.apache.tuscany.sca.extensibility.test.TestInterface
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/META-INF/MANIFEST.MF
index 71fbb7e6a9..71fbb7e6a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/pom.xml
index acc11bad36..acc11bad36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
index 4d86a08eaa..4d86a08eaa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/main/java/org/apache/tuscany/sca/host/corba/jee/JEECorbaHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
index 45da924da6..45da924da6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
index fd952a02c7..fd952a02c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/JEECorbaHostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
index a0b9b7c514..a0b9b7c514 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
index f480235fa8..f480235fa8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/TestInitialContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
index f9f3d4789e..f9f3d4789e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
index 9ed4c81248..9ed4c81248 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
index 357c1eddb0..357c1eddb0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
index c2d4877791..c2d4877791 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/TestInterfaceOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
index 9846748775..9846748775 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
index cd722214ed..cd722214ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/general/_TestInterfaceStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
index 6195f3af9c..6195f3af9c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/java/org/apache/tuscany/sca/host/corba/jee/testing/servants/TestInterfaceServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/resources/general.idl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/resources/general.idl
index 9194a37334..9194a37334 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jee/src/test/resources/general.idl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jee/src/test/resources/general.idl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
index 8edf701bf7..8edf701bf7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/pom.xml
index c43cec72ac..c43cec72ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
index 4a395631b1..4a395631b1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/src/main/java/org/apache/tuscany/sca/host/corba/jse/tns/TnsDefaultCorbaHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
index 5706b13a42..5706b13a42 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
index 85ac98cfef..85ac98cfef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse-tns/src/test/java/org/apache/tuscany/sca/host/corba/testing/TnsDefaultCorbaHostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/META-INF/MANIFEST.MF
index 701f471038..701f471038 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/pom.xml
index 912e50f835..912e50f835 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
index 9bdcd12988..9bdcd12988 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
index 59f0ce9a53..59f0ce9a53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/NamingContextBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
index 087b2e4357..087b2e4357 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
index 77617a6c5c..77617a6c5c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNameService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
index a7164e9ef3..a7164e9ef3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientNamingContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
index 444143f173..444143f173 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/naming/TransientServiceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
index 164988d4d8..164988d4d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHost
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
index 4a6a01bf97..4a6a01bf97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
index 8d1a9db9e9..8d1a9db9e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
index fe85dc7743..fe85dc7743 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
index 305a4d7b97..305a4d7b97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceHolder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
index f557d3e020..f557d3e020 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/TestInterfaceOperations.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
index f993066dab..f993066dab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceImplBase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
index 30a77deaf5..30a77deaf5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/general/_TestInterfaceStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
index 0ebde8ef0d..0ebde8ef0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/servants/TestInterfaceServant.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/resources/general.idl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/resources/general.idl
index f67566deb8..f67566deb8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba-jse/src/test/resources/general.idl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba-jse/src/test/resources/general.idl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/META-INF/MANIFEST.MF
index 2b38d299c0..2b38d299c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/pom.xml
index 2bd19859a7..2bd19859a7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
index eb49f3f841..eb49f3f841 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
index 049bfdb6cd..049bfdb6cd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
index 067b9193c5..067b9193c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
index b90fe9c78b..b90fe9c78b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbaHostUtils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
index a380fd6d79..a380fd6d79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
index 6ed7f3ea83..6ed7f3ea83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/DefaultCorbaHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
index 644682e106..644682e106 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/ExtensibleCorbaHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
index 6989b3ad06..6989b3ad06 100755
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/SocketUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
index a72bed4ea8..a72bed4ea8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
index 4e076f9342..4e076f9342 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-corba/src/test/java/org/apache/tuscany/sca/host/corba/UtilsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/META-INF/MANIFEST.MF
index 33d1e52caf..33d1e52caf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/pom.xml
index 6aff47864e..6aff47864e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
index 3de0b9f5a7..3de0b9f5a7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultResourceServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
index 3145e90164..3145e90164 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/DefaultServletHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
index 1b639041f7..1b639041f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ExtensibleServletHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/SecurityContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/SecurityContext.java
index f290bb3e59..f290bb3e59 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/SecurityContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/SecurityContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
index 6b38559204..6b38559204 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
index 8ef48e4949..8ef48e4949 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostHelper.java
index 5b925f5b2c..5b925f5b2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletHostHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
index ae66c44c3e..ae66c44c3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/ServletMappingException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/UserContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/UserContext.java
index 4a19eda81d..4a19eda81d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/UserContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/java/org/apache/tuscany/sca/host/http/UserContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
index d2d165d6f3..d2d165d6f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHostExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/META-INF/MANIFEST.MF
index 56499b5592..56499b5592 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/pom.xml
index b384ee3906..b384ee3906 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
index 4f5bfb3c62..4f5bfb3c62 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
index be56bdb682..be56bdb682 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
index ba131e0e94..ba131e0e94 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
index a93f4d5754..a93f4d5754 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
index 7c470ca939..7c470ca939 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/test/resources/content/test.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/test/resources/content/test.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/test/resources/content/test.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/test/resources/tuscany.keyStore b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/test/resources/tuscany.keyStore
index 7ea23f7ff4..7ea23f7ff4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-jetty/src/test/resources/tuscany.keyStore
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-jetty/src/test/resources/tuscany.keyStore
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/META-INF/MANIFEST.MF
index 567c222abe..567c222abe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/pom.xml
index 444bddcca3..444bddcca3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
index dade6ef7f3..dade6ef7f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
index 541ee8ba06..541ee8ba06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/DefaultRMIHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
index d1936518ca..d1936518ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/ExtensibleRMIHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
index df3f074168..df3f074168 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
index 5ea46b9e0b..5ea46b9e0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
index 40d6013940..40d6013940 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
index dfbcc62939..dfbcc62939 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMIHostRuntimeException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java
index 763e5c1315..763e5c1315 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/java/org/apache/tuscany/sca/host/rmi/RMISocketFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
index e7f8d54489..e7f8d54489 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
index 1164c33a16..1164c33a16 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/META-INF/MANIFEST.MF
index 871a1b160d..871a1b160d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/NOTICE
index 84e148eeef..84e148eeef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/pom.xml
index fcfbcf8e9e..fcfbcf8e9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
index 45c1bbf3da..45c1bbf3da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
index a12466a9fd..a12466a9fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServletFilter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
index d7569eb91e..d7569eb91e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
index 76cce939ad..76cce939ad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppRequestDispatcher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
index 3f14438c1f..3f14438c1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
index de0d15435c..de0d15435c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.http.ServletHost
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/LICENSE
index baba9ca048..baba9ca048 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
index 79977c6864..79977c6864 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/NOTICE
index a2f696be26..a2f696be26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/pom.xml
index daff67b0cf..daff67b0cf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
index fe1e2d620b..fe1e2d620b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/DeploymentWorkspace.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/DeploymentWorkspace.java
index 8553574aa9..8553574aa9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/DeploymentWorkspace.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/DeploymentWorkspace.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
index 939c33c21c..939c33c21c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
index 11af0f8b50..11af0f8b50 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/GeronimoTxFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
index 8e339812cd..8e339812cd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEBindingContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
index 0eedd5d0e5..0eedd5d0e5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeployment.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
index b03f69d9aa..b03f69d9aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEDeploymentException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java
index 700443d9b7..700443d9b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEndpointReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEprContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEprContext.java
index 972f77ad65..972f77ad65 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEprContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEEprContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
index d2dbd4880d..d2dbd4880d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEExternalService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
index 2fa91e4e86..2fa91e4e86 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEInitializationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
index 1ec82390cf..1ec82390cf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEMessageExchangeContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
index a928379ba9..a928379ba9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ODEShutdownException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
index deaeaec040..deaeaec040 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyEPR.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
index aaa00069f5..aaa00069f5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyPRC.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
index 2c904a37f8..2c904a37f8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
index b3824bffe1..b3824bffe1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
index ed327e237b..ed327e237b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
index 4a99fe705c..4a99fe705c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/ODEInvocationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/ODEInvocationException.java
index 7b6f9ceafa..7b6f9ceafa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/ODEInvocationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/ODEInvocationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 763f8a601b..763f8a601b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
index 0f59990377..0f59990377 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/helloworld/deploy.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/helloworld/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/helloworld/deploy.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/helloworld/deploy.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/helloworld/greetings.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/helloworld/greetings.wsdl
index e768707ccd..e768707ccd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/helloworld/greetings.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/helloworld/greetings.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.bpel
index 1799a5ebd3..1799a5ebd3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/log4j.properties
index 82b3c09723..82b3c09723 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel-runtime/src/test/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel-runtime/src/test/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/LICENSE
index baba9ca048..baba9ca048 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/META-INF/MANIFEST.MF
index dce7e9e25f..dce7e9e25f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/NOTICE
index a2f696be26..a2f696be26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/pom.xml
index bd0a16f613..bd0a16f613 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
index 9f8f9c0e9a..9f8f9c0e9a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
index db5d808f7a..db5d808f7a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
index 2ad088719b..2ad088719b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
index bd98a4af95..bd98a4af95 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
index 67eb9bd047..67eb9bd047 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
index 5ef4a4c113..5ef4a4c113 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
index 83860f59e5..83860f59e5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
index 2c50ae98c3..2c50ae98c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
index c149d228c6..c149d228c6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
index 959d1ec5d5..959d1ec5d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImportElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
index ea645e1304..ea645e1304 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
index 8786837e97..8786837e97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELPartnerLinkTypeElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELProcessorConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELProcessorConstants.java
index 952ba9fe78..952ba9fe78 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELProcessorConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELProcessorConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index ffb781d3b4..ffb781d3b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 1e11d2fc0c..1e11d2fc0c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index d5b5b15984..d5b5b15984 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
index 34af3316d5..34af3316d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.bpel.BPELFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
index b6d8bdc0f1..b6d8bdc0f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/main/resources/impl-bpel-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
index 1ef972342a..1ef972342a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
index 37e5660636..37e5660636 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementationProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
index 8cf91adc2c..8cf91adc2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
index 610bda3cc4..610bda3cc4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-bpel/src/test/resources/helloworld/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/META-INF/MANIFEST.MF
index af05a6b540..af05a6b540 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/pom.xml
index 177959fe09..177959fe09 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index e2d99852d8..e2d99852d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index df21e013f1..df21e013f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index 209546ce2f..209546ce2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 7c96606cf6..7c96606cf6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/databinding/PropertyDataTypeProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/databinding/PropertyDataTypeProcessor.java
index 99a8b6d3d7..99a8b6d3d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/databinding/PropertyDataTypeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/databinding/PropertyDataTypeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 2513c63e38..2513c63e38 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index d8eef18c74..d8eef18c74 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index dd454be7c5..dd454be7c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index 8bc2dce76c..8bc2dce76c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index 4d062859b9..4d062859b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 5aeebcca36..5aeebcca36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 606984659d..606984659d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 2906897e96..2906897e96 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index baf9eb9cc1..baf9eb9cc1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index 43fb5d6170..43fb5d6170 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index d5c1c7b69e..d5c1c7b69e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 8f55eb18bc..8f55eb18bc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 25c09231c5..25c09231c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index e6ebb5abc3..e6ebb5abc3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 1c330ea913..1c330ea913 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index 6cd16202ba..6cd16202ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index f2a0d576db..f2a0d576db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index 614590d738..614590d738 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index 4a5ad98e5b..4a5ad98e5b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 4d54fbd46c..4d54fbd46c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index 3cee156d76..3cee156d76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index b59966a39e..b59966a39e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 7fcfaad615..7fcfaad615 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index 515a7c8a43..515a7c8a43 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index dbc5c6b640..dbc5c6b640 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
index 9d5f943f46..9d5f943f46 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 2b67aa59ca..2b67aa59ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
index e649b68466..e649b68466 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 1c2626706b..1c2626706b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
index 07008049e8..07008049e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
index e790317458..e790317458 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index 629ba8b321..629ba8b321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
index 628a308c86..628a308c86 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
index 29dcfa8169..29dcfa8169 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index 098789f495..098789f495 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
index 366f21d9f0..366f21d9f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index e9cbce4390..e9cbce4390 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index 19184d5204..19184d5204 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
index ed7a0e7d03..ed7a0e7d03 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index c1650c3a83..c1650c3a83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 0bb222bad4..0bb222bad4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index de371e09bb..de371e09bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index ea9d15b3f6..ea9d15b3f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index e993cdd382..e993cdd382 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index f5128f6a6c..f5128f6a6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a5e12d181c..a5e12d181c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index 9624865dcc..9624865dcc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/META-INF/MANIFEST.MF
index 44f27a2c5f..44f27a2c5f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/pom.xml
index 4953bff0c9..4953bff0c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index f98a617925..f98a617925 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
index df76d3ea4e..df76d3ea4e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
index e748a5f6fa..e748a5f6fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index 60649eb5d6..60649eb5d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
index 80911a9552..80911a9552 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
index 19a9f38549..19a9f38549 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
index c977736630..c977736630 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 0d9187c14f..0d9187c14f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index ff41517862..ff41517862 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index a579a6719c..a579a6719c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 5f7885ed5d..5f7885ed5d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
index 26ca54df88..26ca54df88 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 4b0f5bea55..4b0f5bea55 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
index 186e46c486..186e46c486 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index 180ea3e64d..180ea3e64d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 4aa29d3b91..4aa29d3b91 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index c6e6b6e4d6..c6e6b6e4d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 1813a177b4..1813a177b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 52a3fbd89a..52a3fbd89a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 651ecdbd7e..651ecdbd7e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index a4b760760c..a4b760760c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index d6494e3845..d6494e3845 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 8bfae89162..8bfae89162 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 38f6478531..38f6478531 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index b9e1923e73..b9e1923e73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 300ad6817e..300ad6817e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 2d177b3f76..2d177b3f76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 9ad7e8f7a9..9ad7e8f7a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 1deb4e824d..1deb4e824d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index badd41fbb9..badd41fbb9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index fa1e67a336..fa1e67a336 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 0c4c3d5646..0c4c3d5646 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 2956b60b65..2956b60b65 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 54f7dfad1e..54f7dfad1e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 25196c56e5..25196c56e5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index ccfbaf0043..ccfbaf0043 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e0f90779a1..e0f90779a1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index a5227fc4f5..a5227fc4f5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index c75dfdaf46..c75dfdaf46 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java
index 079495e4db..079495e4db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 429b88aa1f..429b88aa1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index fbf3fc9ed3..fbf3fc9ed3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index debb5cbacc..debb5cbacc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java
index 230c8c6fdd..230c8c6fdd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 453cfa35fe..453cfa35fe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 15d31a5ad9..15d31a5ad9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index ed68be20b4..ed68be20b4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index b5c3806166..b5c3806166 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index 3d43e39ce8..3d43e39ce8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index 3abe832cb9..3abe832cb9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index dfc122c715..dfc122c715 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index d062fdc3f2..d062fdc3f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index e1ca3ea565..e1ca3ea565 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index bfaa759cd2..bfaa759cd2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/package.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/package.html
index 53614a627b..53614a627b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/package.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/package.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index c23f5e4d39..c23f5e4d39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index efb4a37143..efb4a37143 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2b09ee1d4d..2b09ee1d4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index 5c1a797cf5..5c1a797cf5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
index 676dd272e1..676dd272e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
index 4976bc0e9f..4976bc0e9f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/AddService.java
index 9c22177684..9c22177684 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
index 64298b6275..64298b6275 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
index 9f64dc8bca..9f64dc8bca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/DivideService.java
index 9599c86292..9599c86292 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
index f5b8ff5be0..f5b8ff5be0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/MultiplyService.java
index 7a3d06c15e..7a3d06c15e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
index d146d23153..d146d23153 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/SubtractService.java
index 21af91f392..21af91f392 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
index ffe09c3dde..ffe09c3dde 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index b77aea4c78..b77aea4c78 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index ce79ae2045..ce79ae2045 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index 512e34a0fa..512e34a0fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 83e26dff84..83e26dff84 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index eeeee851e4..eeeee851e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index e8d26f6103..e8d26f6103 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index 124c83e9e2..124c83e9e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index b524803062..b524803062 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 04d87f60fe..04d87f60fe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index 39a2980b2b..39a2980b2b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index 394857576d..394857576d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index ede71a90dd..ede71a90dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 07ab6f28c8..07ab6f28c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index 5df7078aa6..5df7078aa6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index e3d747fc28..e3d747fc28 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 559659cdeb..559659cdeb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index 6a7987a376..6a7987a376 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index c09b0547c9..c09b0547c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index 758584221d..758584221d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 68f3b9e456..68f3b9e456 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index 4adf57eeeb..4adf57eeeb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java
index a90a6d18c7..a90a6d18c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 635b491b06..635b491b06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index 6be50d138f..6be50d138f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index fdd606c58e..fdd606c58e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index 87798357e0..87798357e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index 9ecb608816..9ecb608816 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 18bb3078e2..18bb3078e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/LICENSE
index fa1256bf99..fa1256bf99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
index 90894d9bd0..90894d9bd0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/NOTICE
index 5dba7efd2c..5dba7efd2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/pom.xml
index ae889c2351..ae889c2351 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/provider/JAXRSImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/provider/JAXRSImplementationProvider.java
index 91d4607831..91d4607831 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/provider/JAXRSImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/provider/JAXRSImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/provider/JAXRSImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/provider/JAXRSImplementationProviderFactory.java
index 2f638240f6..2f638240f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/provider/JAXRSImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/provider/JAXRSImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index d945bdd048..d945bdd048 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorld.java
index 3a493ea10e..3a493ea10e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java
index 97ff1cb13e..97ff1cb13e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/HelloWorldApp.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
index 34edff56ca..34edff56ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/test/java/helloworld/jaxrs/test/HelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/test/resources/helloworld/jaxrs/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/test/resources/helloworld/jaxrs/HelloWorld.composite
index db7329ca3e..db7329ca3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs-runtime/src/test/resources/helloworld/jaxrs/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs-runtime/src/test/resources/helloworld/jaxrs/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/META-INF/MANIFEST.MF
index b2920bf5a6..b2920bf5a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/pom.xml
index 9b50a743d4..9b50a743d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/JAXRSImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/JAXRSImplementation.java
index 8180ab2849..8180ab2849 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/JAXRSImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/JAXRSImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/JAXRSImplementationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/JAXRSImplementationFactory.java
index 109857741c..109857741c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/JAXRSImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/JAXRSImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/impl/JAXRSImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/impl/JAXRSImplementationFactoryImpl.java
index 46d38e4131..46d38e4131 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/impl/JAXRSImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/impl/JAXRSImplementationFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/impl/JAXRSImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/impl/JAXRSImplementationImpl.java
index 4c19f1b52e..4c19f1b52e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/impl/JAXRSImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/impl/JAXRSImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/xml/JAXRSImplementationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/xml/JAXRSImplementationProcessor.java
index da25b6edd5..da25b6edd5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/xml/JAXRSImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/java/org/apache/tuscany/sca/implementation/jaxrs/xml/JAXRSImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index cd6ce79744..cd6ce79744 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 67f1f8bc68..67f1f8bc68 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jaxrs.JAXRSImplementationFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jaxrs.JAXRSImplementationFactory
index 01e6f77b6a..01e6f77b6a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jaxrs.JAXRSImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.jaxrs.JAXRSImplementationFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/resources/org/apache/tuscany/sca/implementation/jaxrs/tuscany-sca-1.1-implementation-jaxrs.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/resources/org/apache/tuscany/sca/implementation/jaxrs/tuscany-sca-1.1-implementation-jaxrs.xsd
index 8b51ca830d..8b51ca830d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/main/resources/org/apache/tuscany/sca/implementation/jaxrs/tuscany-sca-1.1-implementation-jaxrs.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/main/resources/org/apache/tuscany/sca/implementation/jaxrs/tuscany-sca-1.1-implementation-jaxrs.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/test/java/org/apache/tuscany/sca/implementation/jaxrs/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/test/java/org/apache/tuscany/sca/implementation/jaxrs/xml/ReadTestCase.java
index 1de9426cbe..1de9426cbe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/test/java/org/apache/tuscany/sca/implementation/jaxrs/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/test/java/org/apache/tuscany/sca/implementation/jaxrs/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/test/java/org/apache/tuscany/sca/implementation/jaxrs/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/test/java/org/apache/tuscany/sca/implementation/jaxrs/xml/WriteTestCase.java
index 7dcf70c711..7dcf70c711 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/test/java/org/apache/tuscany/sca/implementation/jaxrs/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/test/java/org/apache/tuscany/sca/implementation/jaxrs/xml/WriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/test/resources/org/apache/tuscany/sca/implementation/jaxrs/xml/TestJAXRS.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/test/resources/org/apache/tuscany/sca/implementation/jaxrs/xml/TestJAXRS.composite
index 6c4254e4b8..6c4254e4b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-jaxrs/src/test/resources/org/apache/tuscany/sca/implementation/jaxrs/xml/TestJAXRS.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-jaxrs/src/test/resources/org/apache/tuscany/sca/implementation/jaxrs/xml/TestJAXRS.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
index 478d05eec4..478d05eec4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/pom.xml
index eec1cf8aad..eec1cf8aad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
index 1d5d99cd34..1d5d99cd34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
index 11b29de248..11b29de248 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
index a9a2fdbd0b..a9a2fdbd0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/OSGiTargetInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
index 8718e58d8e..8718e58d8e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 33f152ba13..33f152ba13 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties
index 2503be0b13..2503be0b13 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi-runtime/src/main/resources/impl-osgi-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/META-INF/MANIFEST.MF
index 8108f9680a..8108f9680a 100755
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/pom.xml
index b99861ebda..b99861ebda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java
index 20c7e8d60a..20c7e8d60a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultOSGiImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java
index d7296e24bb..d7296e24bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/DefaultServiceDescriptionsFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
index ba5e5284be..ba5e5284be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java
index 23952dfee4..23952dfee4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
index ff889f8577..ff889f8577 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiProperty.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java
index a54324b027..a54324b027 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/SCAConfig.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java
index 119d7ed657..119d7ed657 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescription.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java
index a5322429ff..a5322429ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptions.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java
index 535bef2b6b..535bef2b6b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/ServiceDescriptionsFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java
index 17ebf12903..17ebf12903 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
index 4e89cbb7d3..4e89cbb7d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java
index b3e934a970..b3e934a970 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiPropertyImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java
index 4bb1b2340f..4bb1b2340f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/SCAConfigImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java
index 5bd1d17253..5bd1d17253 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java
index 716984a13b..716984a13b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java
index c249c053a4..c249c053a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/ServiceDescriptionsImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java
index ca6b0b70e1..ca6b0b70e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java
index 860d3f6f45..860d3f6f45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java
index b604447696..b604447696 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
index d98616cbc2..d98616cbc2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java
index a0c9baf6f1..a0c9baf6f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiPropertyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java
index 86ff968d0e..86ff968d0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/SCAConfigProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java
index ad175e009c..ad175e009c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java
index cd62d5cfaf..cd62d5cfaf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java
index 891fed13d0..891fed13d0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
index 8718e58d8e..8718e58d8e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index e8973a91db..e8973a91db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 7e7a20b69c..7e7a20b69c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 78e47fed7e..78e47fed7e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory
index 7c6660980b..7c6660980b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.OSGiImplementationFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory
index 47193ece15..47193ece15 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.osgi.ServiceDescriptionsFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
index a406ea21c3..a406ea21c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/main/resources/impl-osgi-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java
index 656b78b717..656b78b717 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java
index 224467181b..224467181b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/BluePrintComponentsProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java
index ef49121c2c..ef49121c2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiComponentProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
index 614f243eb3..614f243eb3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/OSGiReadImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
index 0e7acc354a..0e7acc354a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/ServiceDescriptionsTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
index 17fef8a05c..17fef8a05c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/xml/TestModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml
index 3e537df732..3e537df732 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/resources/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
index 401809c197..401809c197 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/resources/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/resources/osgitest.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/resources/osgitest.composite
index 7c54e46a54..7c54e46a54 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-osgi/src/test/resources/osgitest.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-osgi/src/test/resources/osgitest.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/META-INF/MANIFEST.MF
index aed41dbb4f..aed41dbb4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/NOTICE
index c1b42b04ed..c1b42b04ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/pom.xml
index 1604666366..1604666366 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
index f84faa7bb4..f84faa7bb4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
index 5bed70cbc7..5bed70cbc7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
index 976eb2c0dd..976eb2c0dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
index b56af79b0b..b56af79b0b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/java/org/apache/tuscany/sca/implementation/script/provider/ScriptPropertyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 941cfd7fd5..941cfd7fd5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
index d9277c3ae1..d9277c3ae1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/AbstractSCATestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
index 1af3a295a4..1af3a295a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/AbstractHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
index 6a4f10dbbb..6a4f10dbbb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
index f87cf104f3..f87cf104f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
index cffe65c27a..cffe65c27a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/HelloWorldProxy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
index ca4bd5ae6a..ca4bd5ae6a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
index 46ed9abce6..46ed9abce6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
index d694515829..d694515829 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
index e7375253a3..e7375253a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/AbstractHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
index f93edc76d1..f93edc76d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
index 910d22ec83..910d22ec83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
index 719212e831..719212e831 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/HelloWorldProxy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
index 60c73359c0..60c73359c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
index cde96b4b9b..cde96b4b9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
index 0e6be74e09..0e6be74e09 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
index 6116581356..6116581356 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
index dfcd37c46c..dfcd37c46c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/HelloWorldTarget.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
index 83c2e99469..83c2e99469 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
index 392e16411c..392e16411c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
index 8866ae6b70..8866ae6b70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/java/org/apache/tuscany/sca/implementation/script/itests/references/JythonReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
index 056fb5b4ce..056fb5b4ce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/GroovyHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
index 05dd2bab22..05dd2bab22 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JRubyHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
index fc9c7d1055..fc9c7d1055 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JavaScriptHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
index 3cc28fc531..3cc28fc531 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/JythonHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
index f190d5ef35..f190d5ef35 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
index 9f89bd373e..9f89bd373e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.groovy
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
index eac2ab283f..eac2ab283f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.js
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
index f5dd0f8fcf..f5dd0f8fcf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.py
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
index cd2d3bcaea..cd2d3bcaea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/helloworld/helloworld.rb
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
index dd8279049d..dd8279049d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/GroovyHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
index 40e8d18a31..40e8d18a31 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JRubyHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
index b258d69229..b258d69229 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JavaScriptHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
index a3e15e53b0..a3e15e53b0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/JythonHelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
index 4cf7172ebc..4cf7172ebc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
index a7eb446d37..a7eb446d37 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.groovy
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
index 64df3ebbef..64df3ebbef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.js
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
index 868cfa9eeb..868cfa9eeb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.py
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
index 2844f8b8d9..2844f8b8d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/properties/helloworld.rb
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
index 4cfcec2f4e..4cfcec2f4e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/GroovyReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
index da4e721faf..da4e721faf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
index d741cc1c89..d741cc1c89 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JavaScriptReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
index 23f78ec342..23f78ec342 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JythonReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
index 347e9b1c40..347e9b1c40 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
index 5d2216d583..5d2216d583 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.groovy
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
index ad0a932d26..ad0a932d26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.js
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
index aee8bf991d..aee8bf991d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.py
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
index 87f0f56082..87f0f56082 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/reference.rb
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/META-INF/MANIFEST.MF
index 4b7bb9a472..4b7bb9a472 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/NOTICE
index c1b42b04ed..c1b42b04ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/pom.xml
index f4837d114f..f4837d114f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
index d34dde61eb..d34dde61eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java
index c7a4c7fa2d..c7a4c7fa2d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java
index d85d8924ba..d85d8924ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java
index a610e77147..a610e77147 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/impl/ScriptImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java
index 273306894b..273306894b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/xml/ScriptImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index c3db94d4a8..c3db94d4a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory
index 5da5a817aa..5da5a817aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-script/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.script.ScriptImplementationFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/META-INF/MANIFEST.MF
index 3d2fe4bcbd..3d2fe4bcbd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/README b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/README
index e1b1f98fe0..e1b1f98fe0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/pom.xml
index 455069db26..455069db26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
index 75e00007f6..75e00007f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/SCANamespaceHandlerResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
index f136e45b87..f136e45b87 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaNamespaceHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
index 5b1064d8d8..5b1064d8d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaPropertyBeanDefinitionParser.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
index fac02760c9..fac02760c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaReferenceBeanDefinitionParser.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
index 3020dca8bc..3020dca8bc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/namespace/ScaServiceBeanDefinitionParser.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
index 7613f8166d..7613f8166d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentNameAnnotationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
index c72ccd6636..c72ccd6636 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ComponentStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
index 7eb63678f6..7eb63678f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ConstructorAnnotationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
index 477582b1d3..477582b1d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/InitDestroyAnnotationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
index f800654c34..f800654c34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyAnnotationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
index ea8f560ae1..ea8f560ae1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/PropertyValueStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
index dd43d63d97..dd43d63d97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/processor/ReferenceAnnotationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
index 6426306f26..6426306f26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAGenericApplicationContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
index 5ea1c2fd9d..5ea1c2fd9d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SCAParentApplicationContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
index 77681b600f..77681b600f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
index af39869522..af39869522 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers
index 6d29e21024..6d29e21024 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/resources/META-INF/spring.handlers
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas
index 249cc21c13..249cc21c13 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/resources/META-INF/spring.schemas
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
index dfa0b931f6..dfa0b931f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring-sca/src/main/resources/org/springframework/sca/xml/spring-sca.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/META-INF/MANIFEST.MF
index 988718b178..988718b178 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/README b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/README
index e1b1f98fe0..e1b1f98fe0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/pom.xml
index b0f4f18421..b0f4f18421 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
index f64c5f9476..f64c5f9476 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringBeanElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
index 9ae1273592..9ae1273592 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringConstructorArgElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
index 7a73f79a45..7a73f79a45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationBuilder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationBuilder.java
index 1a246fa03a..1a246fa03a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
index caae72fa90..caae72fa90 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
index 37b8ef37a6..37b8ef37a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringPropertyElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
index b192580a78..b192580a78 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAPropertyElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
index bc010229ad..bc010229ad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAReferenceElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
index dbddc00b33..dbddc00b33 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringSCAServiceElement.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
index 3aa257686d..3aa257686d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanIntrospector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
index 3a8eec99fa..3a8eec99fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringBeanPojoProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
index bd3134c5f2..bd3134c5f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
index b97c02d216..b97c02d216 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/ComponentTie.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
index 89d14961ac..89d14961ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/PropertyValueTie.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
index dcb9a53a33..dcb9a53a33 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
index 0ecd00d5a8..0ecd00d5a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
index 01b458d1f5..01b458d1f5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
index 6caa5207e4..6caa5207e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
index 6a23830aa9..6a23830aa9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvocationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
index 1f9796ccc4..1f9796ccc4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
index d553011098..d553011098 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
index 7ea615051e..7ea615051e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 880d6fade0..880d6fade0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 4a9270d094..4a9270d094 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index edd3d2e529..edd3d2e529 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
index 28bd31ca11..28bd31ca11 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/impl-spring-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
index 18e7b1e60a..18e7b1e60a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-spring/src/main/resources/org/apache/tuscany/sca/implementation/spring/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/LICENSE
index fa1256bf99..fa1256bf99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/META-INF/MANIFEST.MF
index 6690eac03d..6690eac03d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/NOTICE
index 5dba7efd2c..5dba7efd2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/pom.xml
index fea5cb689e..fea5cb689e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java
index 5316efeef0..5316efeef0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/ClientServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/JSClientExtensionPointImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/JSClientExtensionPointImpl.java
index 049cda2eb8..049cda2eb8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/JSClientExtensionPointImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/src/main/java/org/apache/tuscany/sca/implementation/web/client/JSClientExtensionPointImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.runtime.ClientExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.runtime.ClientExtensionPoint
index d11c486a4b..d11c486a4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.runtime.ClientExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.runtime.ClientExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/LICENSE
index f602cf9395..f602cf9395 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/META-INF/MANIFEST.MF
index f89ea5b24a..f89ea5b24a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/NOTICE
index 954815cf00..954815cf00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/pom.xml
index 0ac914642e..0ac914642e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ClientExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ClientExtensionPoint.java
index ed66c6efed..ed66c6efed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ClientExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ClientExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
index 798b3e704c..798b3e704c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
index d0323545ea..d0323545ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/WebImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTEI.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTEI.java
index 2ba7944326..2ba7944326 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTEI.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTEI.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTag.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTag.java
index b4655e3d95..b4655e3d95 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTag.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/jsp/ReferenceTag.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/utils/ContextHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/utils/ContextHelper.java
index 423e906d6b..423e906d6b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/utils/ContextHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/utils/ContextHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
index 8a9ce93204..8a9ce93204 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 4e26825cfe..4e26825cfe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/META-INF/MANIFEST.MF
index 97f6ffb8e2..97f6ffb8e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/pom.xml
index 59bce72414..59bce72414 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
index c7613a9045..c7613a9045 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
index df2e6c5520..df2e6c5520 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/WebImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java
index 41adb73f61..41adb73f61 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
index daff2d23a1..daff2d23a1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
index bdf9c81909..bdf9c81909 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/impl/WebImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
index afcc85b58f..afcc85b58f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/java/org/apache/tuscany/sca/implementation/web/xml/WebImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
index 7e306cb9a0..7e306cb9a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.ImplementationBuilder
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 89ef50ba58..89ef50ba58 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
index 0487da71b1..0487da71b1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.web.WebImplementationFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
index d9460194e5..d9460194e5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
index ebad994033..ebad994033 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/test/java/org/apache/tuscany/sca/implementation/web/xml/WriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
index 1c5a439654..1c5a439654 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-web/src/test/resources/org/apache/tuscany/sca/implementation/web/xml/TestWeb.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/META-INF/MANIFEST.MF
index c55ce4de46..c55ce4de46 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/pom.xml
index b6a08d491e..b6a08d491e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
index d9e4e698e0..d9e4e698e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/src/main/java/org/apache/tuscany/sca/implementation/widget/dojo/DojoJavaScriptComponentGeneratorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
index 3f503c24ee..3f503c24ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGenerator
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
index fd792c336f..fd792c336f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/pom.xml
index e28dcdc5b7..e28dcdc5b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
index a28e014b2e..a28e014b2e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetComponentScriptServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
index 28a1f6d1db..28a1f6d1db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationInvoker.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
index 28f041b919..28f041b919 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
index 9c140f0913..9c140f0913 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index d0f73cbdbb..d0f73cbdbb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/resources/atomModel.js b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/resources/atomModel.js
index c64c3fc97c..c64c3fc97c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/resources/atomModel.js
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/resources/atomModel.js
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/resources/binding-http.js b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/resources/binding-http.js
index 60bd841679..60bd841679 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget-runtime/src/main/resources/binding-http.js
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget-runtime/src/main/resources/binding-http.js
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/META-INF/MANIFEST.MF
index fcc1ede5d2..fcc1ede5d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/pom.xml
index 373e6f1d0a..373e6f1d0a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
index f1c1c36934..f1c1c36934 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
index d032d3ca8d..d032d3ca8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
index 74addf1e39..74addf1e39 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
index 9bf8c05d73..9bf8c05d73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
index bf84a15aa6..bf84a15aa6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java
index 960a01d07e..960a01d07e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
index 58edfdd3ba..58edfdd3ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/javascript/WidgetImplementationJavascriptProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/javascript/WidgetImplementationJavascriptProvider.java
index 55cf7dbf0e..55cf7dbf0e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/javascript/WidgetImplementationJavascriptProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/javascript/WidgetImplementationJavascriptProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 24d6c8b419..24d6c8b419 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
index 633dda5675..633dda5675 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
index 3778bd4c50..3778bd4c50 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/implementation-widget/src/main/resources/impl-widget-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/META-INF/MANIFEST.MF
index f45e70ad23..f45e70ad23 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/pom.xml
index 4ae0881374..4ae0881374 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/CodeGenerationHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/CodeGenerationHelper.java
index 9fffd93dca..9fffd93dca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/CodeGenerationHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/CodeGenerationHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/GeneratedClassLoader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/GeneratedClassLoader.java
index b679f34835..b679f34835 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/GeneratedClassLoader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/GeneratedClassLoader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSJavaInterfaceProcessor.java
index 71683ba2c4..71683ba2c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSJavaInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGenerator.java
index 969efeb4f1..969efeb4f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
index 9101d744b3..9101d744b3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Bean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Bean.java
index 20a4276b8b..20a4276b8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Bean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Bean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSInterfaceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSInterfaceProcessorTestCase.java
index b680eaa491..b680eaa491 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/JAXRSInterfaceProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/MockedResource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/MockedResource.java
index 46d501d4be..46d501d4be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/MockedResource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/MockedResource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Resource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Resource.java
index ac9fd514bd..ac9fd514bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Resource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/Resource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/ResourceWrapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/ResourceWrapper.java
index 23b674778e..23b674778e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/ResourceWrapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/ResourceWrapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGeneratorTestCase.java
index aa6abcd5f6..aa6abcd5f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxrs/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxrs/RootResourceClassGeneratorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/META-INF/MANIFEST.MF
index ca45f82a45..ca45f82a45 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/pom.xml
index 742e5f4682..742e5f4682 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
index 6c64ad0689..6c64ad0689 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BaseBeanGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
index b05715b54e..b05715b54e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/CodeGenerationHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
index 40fbefa3ed..40fbefa3ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
index 3f035ce585..3f035ce585 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedClassLoader.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
index c3f568ef48..c3f568ef48 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/GeneratedDataTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java
index 155c89c7f2..155c89c7f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
index fcf7006f16..fcf7006f16 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index 1d6b002361..1d6b002361 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
index 18eda13efb..18eda13efb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WebServiceInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
index 764c10ff00..764c10ff00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
index 6a968e11d3..6a968e11d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.FaultExceptionMapper
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
index 86255f4fef..86255f4fef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
index 1b07e25bad..1b07e25bad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
index d38a21ba52..d38a21ba52 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean1.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
index 7b9375063d..7b9375063d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/Bean2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java
index 67b9c84399..67b9c84399 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java
index f964ea374b..f964ea374b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/BeanInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
index 3ea1427494..3ea1427494 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/FaultBeanGeneratorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessorTestCase.java
index ec73ad4218..ec73ad4218 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSAsyncInterfaceProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
index 5f3114a67c..5f3114a67c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
index 6315e12ff8..6315e12ff8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JavaReflectionHelperTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
index 4df0517de6..4df0517de6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
index 78527193d5..78527193d5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/MyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/StockQuote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/StockQuote.java
index d1259e9120..d1259e9120 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/StockQuote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/StockQuote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java
index fb319a3b0f..fb319a3b0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestAdapter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
index 2ecf822904..2ecf822904 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestGenericClass.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
index 1f8e6cb445..1f8e6cb445 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/TestInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
index f83c27e10a..f83c27e10a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/WrapperBeanGeneratorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
index 56a753f4ff..56a753f4ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/resources/wsdl/Stock.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
index 494617f988..494617f988 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/META-INF/MANIFEST.MF
index e61a52374e..e61a52374e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/pom.xml
index cdcde65423..cdcde65423 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
index 89b8c7193d..89b8c7193d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/DefaultJavaInterfaceFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
index 8edd94bc56..8edd94bc56 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
index 69891225e7..69891225e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
index 4f4e9d8268..4f4e9d8268 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaInterfaceFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
index c44650de9f..c44650de9f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/JavaOperation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
index d43ebe558b..d43ebe558b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceContractImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
index b443cb988e..b443cb988e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 0b418054c5..0b418054c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index d05dc7eba8..d05dc7eba8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
index 61d38dac76..61d38dac76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
index 4384213bf5..4384213bf5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaOperationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
index 1610a2e8ec..1610a2e8ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/PolicyJavaInterfaceVisitor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
index 3bc03a528e..3bc03a528e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/JavaInterfaceVisitor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/package.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/package.html
index 828c112479..828c112479 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/package.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/package.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
index 2db916e2d3..2db916e2d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index 805e691f16..805e691f16 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 2cbda24dd8..2cbda24dd8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
index 82972f856a..82972f856a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
index ef73adb3e6..ef73adb3e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
index 73a25551b7..73a25551b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
index c70bdcaf47..c70bdcaf47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilDuplicateRemotableTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
index 86a38fa0c4..86a38fa0c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceUtilTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
index 14ac8b0134..14ac8b0134 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/JavaInterfaceProcessorRegistryImplTestCase.java.fixme
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
index 88ef90edbe..88ef90edbe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/introspection/impl/PolicyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
index 7cacf06abd..7cacf06abd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
index 615fb15fc6..615fb15fc6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/java/org/apache/tuscany/sca/interfacedef/java/xml/WriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
index e5455dc970..e5455dc970 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
index 68793041e1..68793041e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-java/src/test/resources/org/apache/tuscany/sca/interfacedef/java/xml/CalculatorImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/META-INF/MANIFEST.MF
index 75ad6812be..75ad6812be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/pom.xml
index 239206d3a6..239206d3a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
index 26404958e8..26404958e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/BPELPartnerLinkTypeExt.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
index 037dffeadc..037dffeadc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/DefaultWSDLFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
index 039e75f437..039e75f437 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLDefinition.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
index 4e331c1fa4..4e331c1fa4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
index 8c3cc10792..8c3cc10792 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterface.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
index 59db17116b..59db17116b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLInterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
index 0b707163da..0b707163da 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
index d73cccb714..d73cccb714 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLOperation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
index 1e7b4faa32..1e7b4faa32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/InvalidWSDLException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
index 82a7aa1200..82a7aa1200 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLDefinitionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
index 52c9984831..52c9984831 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
index e10bc0d178..e10bc0d178 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceContractImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
index 95906f4a56..95906f4a56 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
index dd19407abe..dd19407abe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
index f18eaef27b..f18eaef27b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
index 317b9cce81..317b9cce81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
index 3fd476c46f..3fd476c46f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLOperationIntrospectorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/package.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/package.html
index e929b86a80..e929b86a80 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/package.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/package.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
index 6007989321..6007989321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/BPELExtensionHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
index ba9bff164c..ba9bff164c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
index 8291ef74ed..8291ef74ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
index cbaa5cbd5e..cbaa5cbd5e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLInterfaceProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
index 33ebde869e..33ebde869e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 68da288a8c..68da288a8c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index c3c5638776..c3c5638776 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index d37b50227e..d37b50227e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
index 4f61700af7..4f61700af7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
index 11756711be..11756711be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/main/resources/interface-wsdlxml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
index 1e66f7c4e4..1e66f7c4e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLInterfaceIntrospectorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
index c4549f8180..c4549f8180 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLOperationIntrospectorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
index 45f4fa78f9..45f4fa78f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WSDLPolicyAnnotatedInterfaceIntrospectorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
index ea02d8c3d6..ea02d8c3d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/introspect/WrapperStyleOperationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
index 143aa47d49..143aa47d49 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/AbstractWSDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
index df06553931..df06553931 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
index 513cb383e4..513cb383e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLDocumentProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
index 90054230ff..90054230ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
index 118f44f1a0..118f44f1a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WriteTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
index 9d714e8169..9d714e8169 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
index eaf8d1b8ee..eaf8d1b8ee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/CalculatorImpl.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
index 5e8e5dad0d..5e8e5dad0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/example.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
index ad81fc7867..ad81fc7867 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/invalid-stockquote.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
index 241ec15d36..241ec15d36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
index 39cd5547d9..39cd5547d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/stockquote.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
index 8e26f7b4b5..8e26f7b4b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
index c2210f4a94..c2210f4a94 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test1.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
index 529b395fd5..529b395fd5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/test2.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
index 666a7e4069..666a7e4069 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/unwrapped-stockquote.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
index 86cbe39af9..86cbe39af9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/policy/stockquote_policy.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl
index 9d9376ad6c..9d9376ad6c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/wsdl/helloworld-interface.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl
index 3885357625..3885357625 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/wsdl/helloworld-service.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/xsd/greeting.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd
index bb0c9bc7b7..bb0c9bc7b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/xsd/helloworld.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/xsd/name.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/interface-wsdl/src/test/resources/xsd/name.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/interface-wsdl/src/test/resources/xsd/name.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/META-INF/MANIFEST.MF
index edcc065b69..edcc065b69 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/pom.xml
index 8483242604..8483242604 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
index 275e0a75c7..275e0a75c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/META-INF/MANIFEST.MF
index c9613cb52c..c9613cb52c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/pom.xml
index b0a36b51b8..b0a36b51b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
index 8a99fa4c7c..8a99fa4c7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/DefaultMonitorFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
index 3eda98ee23..3eda98ee23 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Monitor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
index 12ac7eba7b..12ac7eba7b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/MonitorFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
index c05fa632fb..c05fa632fb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/Problem.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/ValidationException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/ValidationException.java
index 47975870bf..47975870bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/ValidationException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/ValidationException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
index c81581aae0..c81581aae0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/MonitorImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
index acfc409856..acfc409856 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/java/org/apache/tuscany/sca/monitor/impl/ProblemImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
index f2c2a52e78..f2c2a52e78 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/main/resources/META-INF/services/org.apache.tuscany.sca.monitor.MonitorFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
index 6e44b2d5d9..6e44b2d5d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties
index 523263da40..523263da40 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties
index 523263da40..523263da40 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/LICENSE
index c77d3fe856..c77d3fe856 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/META-INF/MANIFEST.MF
index 61618e7c8f..61618e7c8f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/NOTICE
index dfde08644b..dfde08644b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/pom.xml
index d0f281aa76..d0f281aa76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java
index b1ef8eb3ed..b1ef8eb3ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java
index 4a05fa5856..4a05fa5856 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/META-INF/MANIFEST.MF
index ac89f5383a..ac89f5383a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/pom.xml
index 501be29871..501be29871 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
index f69e18dc63..f69e18dc63 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Contribution.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
index 2e73322917..2e73322917 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/ContributionLocationHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
index 502b2f854c..502b2f854c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
index 2d2df84f42..2d2df84f42 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java
index c42bacdd00..c42bacdd00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeMain2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
index a6dab059a3..a6dab059a3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/BindingConfiguration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
index 05c718dbd0..05c718dbd0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/ContributionConfiguration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
index a23cef7e81..a23cef7e81 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DefaultNodeConfigurationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
index 18fecf8044..18fecf8044 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/DeploymentComposite.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
index 12c6994dda..12c6994dda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfiguration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
index 71833bc7e7..71833bc7e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/NodeConfigurationFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java
index 5658187c4f..5658187c4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/BindingConfigurationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
index 5229801731..5229801731 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/ContributionConfigurationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
index a161b426e7..a161b426e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/DeploymentCompositeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
index 86096c9aee..86096c9aee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
index b4ec05cae5..b4ec05cae5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-api/src/main/java/org/apache/tuscany/sca/node/configuration/impl/NodeConfigurationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/META-INF/MANIFEST.MF
index 82b79149f8..82b79149f8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/NOTICE
index 8c74c2267e..8c74c2267e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/pom.xml
index 2e1db7c336..2e1db7c336 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
index 36feb6526a..36feb6526a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java
index 6914e09b8e..6914e09b8e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/NodeManager.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
index c79fc04c4d..c79fc04c4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/impl/OSGiNodeFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java
index 5a4b5aa836..5a4b5aa836 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/AbstractOSGiServiceHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
index 8ecc5f7ea8..8ecc5f7ea8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
index 94ad7fbfc7..94ad7fbfc7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java
index f978ba658d..f978ba658d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointMatcher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportReferenceImpl.java
index 13c7dd3cf3..13c7dd3cf3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportRegistrationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportRegistrationImpl.java
index 39cbd7b9e6..39cbd7b9e6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportRegistrationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ExportRegistrationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportReferenceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportReferenceImpl.java
index 9c5b1818c8..9c5b1818c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportRegistrationImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportRegistrationImpl.java
index 9506128286..9506128286 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportRegistrationImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/ImportRegistrationImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiHelper.java
index 460d291f53..460d291f53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceExporter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceExporter.java
index 081a3a60c0..081a3a60c0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceExporter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceExporter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java
index f24e9af7c1..f24e9af7c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/OSGiServiceImporter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
index 00eb45f3c1..00eb45f3c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/TopologyManagerImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/TopologyManagerImpl.java
index a3f3636cce..a3f3636cce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/TopologyManagerImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/TopologyManagerImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java
index fd57dbded8..fd57dbded8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/AbstractDiscoveryService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/Discovery.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/Discovery.java
index 3ad1e53fee..3ad1e53fee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/Discovery.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/Discovery.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DiscoveryActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DiscoveryActivator.java
index 32bd10b77b..32bd10b77b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DiscoveryActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DiscoveryActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
index 0cbdda7b56..0cbdda7b56 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/DomainDiscoveryService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java
index dc9ae096dd..dc9ae096dd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/service/discovery/impl/LocalDiscoveryService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointDescription.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointDescription.java
index ee7e5ba1bd..ee7e5ba1bd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointDescription.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointDescription.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointListener.java
index 941b899fbb..941b899fbb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java
index 433e22e543..433e22e543 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/EndpointPermission.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ExportReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ExportReference.java
index 03b3235c59..03b3235c59 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ExportReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ExportReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ExportRegistration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ExportRegistration.java
index e8c6c66cbf..e8c6c66cbf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ExportRegistration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ExportRegistration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ImportReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ImportReference.java
index 5fa5673341..5fa5673341 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ImportReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ImportReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ImportRegistration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ImportRegistration.java
index 1fc1c6f6ba..1fc1c6f6ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ImportRegistration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/ImportRegistration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteConstants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteConstants.java
index cf2194ec12..cf2194ec12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteConstants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteConstants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdmin.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdmin.java
index 98f56a07ae..98f56a07ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdmin.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdmin.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdminEvent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdminEvent.java
index 8f4ac717c8..8f4ac717c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdminEvent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdminEvent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdminListener.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdminListener.java
index 2941f8b117..2941f8b117 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdminListener.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/java/org/osgi/service/remoteserviceadmin/RemoteServiceAdminListener.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index 1991eba409..1991eba409 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
index e44fce66a5..e44fce66a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/resources/org/osgi/service/remoteserviceadmin/osgi-remoteserviceadmin.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/resources/org/osgi/service/remoteserviceadmin/osgi-remoteserviceadmin.xsd
index dc88df965c..dc88df965c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/main/resources/org/osgi/service/remoteserviceadmin/osgi-remoteserviceadmin.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/main/resources/org/osgi/service/remoteserviceadmin/osgi-remoteserviceadmin.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
index cf1b78931a..cf1b78931a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index 0960938086..0960938086 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
index 5348d19f34..5348d19f34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 268f16bc9f..268f16bc9f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
index 2af5552279..2af5552279 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/CalculatorOSGiTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
index bdb484e6bb..bdb484e6bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/java/calculator/dosgi/test/OSGiTestBundles.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
index 4b7b7ec71b..4b7b7ec71b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
index b48c048000..b48c048000 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
index 8306fa9834..8306fa9834 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
index 401809c197..401809c197 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
index 830c6867ed..830c6867ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
index 2345c785a7..2345c785a7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
index d24999ab3e..d24999ab3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
index fced5b7840..fced5b7840 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
index c7250912b0..c7250912b0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/operations/operations.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
index 60dc54014a..60dc54014a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
index b48c048000..b48c048000 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
index 1be863568c..1be863568c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl-osgi/src/test/resources/calculator/dosgi/sca/OSGI-INF/sca/calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/META-INF/MANIFEST.MF
index 15eeb4cf15..15eeb4cf15 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/pom.xml
index 9f561f4755..9f561f4755 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java
index d11eb317cf..d11eb317cf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationATOMProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
index 46f46a3757..46f46a3757 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
index fc975c0072..fc975c0072 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
index c3943ce914..c3943ce914 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
index 4da41442f5..4da41442f5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManager.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManager.java
index 12704a3ee5..12704a3ee5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManager.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManager.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManagerMBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManagerMBean.java
index 3133142c2b..3133142c2b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManagerMBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/NodeManagerMBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a9d0f5ef52..a9d0f5ef52 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
index a349dd7c26..a349dd7c26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.NodeFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory
index 9b26d0c7c1..9b26d0c7c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.configuration.NodeConfigurationFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/resources/org/apache/tuscany/sca/node/impl/node-impl-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/resources/org/apache/tuscany/sca/node/impl/node-impl-validation-messages.properties
index 0c07a3a30f..0c07a3a30f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/main/resources/org/apache/tuscany/sca/node/impl/node-impl-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/main/resources/org/apache/tuscany/sca/node/impl/node-impl-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/hello/HelloWorld.java
index e3fcdfd25f..e3fcdfd25f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/hello/HelloWorld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
index c9a7560b12..c9a7560b12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
index a10f2cccd4..a10f2cccd4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
index 3133931210..3133931210 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
index 4b9dda4a71..4b9dda4a71 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/HelloWorld.composite
index ca3c3eda7c..ca3c3eda7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/HelloWorld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
index 20627c3d2c..20627c3d2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
index 4afc52d73b..4afc52d73b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/test-node-factory.config b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/test-node-factory.config
index ec87f6a3e0..ec87f6a3e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/test-node-factory.config
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/test-node-factory.config
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/test.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/test.properties
index df9d47b4eb..df9d47b4eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-impl/src/test/resources/test.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-impl/src/test/resources/test.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/META-INF/MANIFEST.MF
index b76c9c66cd..b76c9c66cd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/pom.xml
index 0081e57efe..0081e57efe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
index 892412b395..892412b395 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
index 056ec080ba..056ec080ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
index e6f59e1b07..e6f59e1b07 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index 90c89fda70..90c89fda70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
index 414f3aae63..414f3aae63 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
index b9bb70b5d7..b9bb70b5d7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
index aeb29c0789..aeb29c0789 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index 678d88dab7..678d88dab7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java
index 14018a7af5..14018a7af5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java
index f3ddbe0f80..f3ddbe0f80 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index 43d5965cc7..43d5965cc7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
index 4b4c4a8978..4b4c4a8978 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
index 3814b42d00..3814b42d00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
index 816e7c44f4..816e7c44f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF
index 41dcb9390e..41dcb9390e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF
index 671a7bff34..671a7bff34 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.8.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF
index 58630c02ef..58630c02ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF
index 107916e4f7..107916e4f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.5.1.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.1.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.1.MF
index efe4d924ce..efe4d924ce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.1.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-transport-http-1.5.1.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-agents-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-agents-1.3.2.MF
index 17e352ad0f..17e352ad0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-agents-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-agents-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-api-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-api-1.3.2.MF
index c25ac992e1..c25ac992e1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-api-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-api-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-compiler-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-compiler-1.3.2.MF
index 2a42b9e941..2a42b9e941 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-compiler-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-compiler-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-dao-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-dao-1.3.2.MF
index 9e6388278b..9e6388278b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-dao-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-dao-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-epr-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-epr-1.3.2.MF
index 4159636f83..4159636f83 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-epr-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-epr-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-obj-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-obj-1.3.2.MF
index 862d40c55f..862d40c55f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-obj-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-obj-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-runtime-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-runtime-1.3.2.MF
index 15dc8ebe30..15dc8ebe30 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-runtime-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-runtime-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-schemas-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-schemas-1.3.2.MF
index 82f4a2732a..82f4a2732a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-schemas-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-schemas-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-store-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-store-1.3.2.MF
index 5e15e872e5..5e15e872e5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-store-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-bpel-store-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-dao-hibernate-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-dao-hibernate-1.3.2.MF
index 7621f3c99f..7621f3c99f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-dao-hibernate-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-dao-hibernate-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-dao-jpa-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-dao-jpa-1.3.2.MF
index a0cf9a138b..a0cf9a138b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-dao-jpa-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-dao-jpa-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-jacob-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-jacob-1.3.2.MF
index da2344cd8d..da2344cd8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-jacob-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-jacob-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-jacob-ap-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-jacob-ap-1.3.2.MF
index 5bacdc2f0f..5bacdc2f0f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-jacob-ap-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-jacob-ap-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-scheduler-simple-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-scheduler-simple-1.3.2.MF
index 3154af5838..3154af5838 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-scheduler-simple-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-scheduler-simple-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-utils-1.3.2.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-utils-1.3.2.MF
index 687d102cd9..687d102cd9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-utils-1.3.2.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/ode-utils-1.3.2.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF
index c15bce67b6..c15bce67b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/xercesImpl-2.9.0.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/xercesImpl-2.9.0.MF
index c113563aed..c113563aed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/xercesImpl-2.9.0.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/xercesImpl-2.9.0.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/META-INF/MANIFEST.MF
index 84d7ba01d8..84d7ba01d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/pom.xml
index a1e4209689..a1e4209689 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
index 4f4f861e2f..4f4f861e2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index ba795216a9..ba795216a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index 56be9f9921..56be9f9921 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index 36fa9e6a21..36fa9e6a21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 38dea77eda..38dea77eda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index 77751dcc47..77751dcc47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 5345363031..5345363031 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/test/java/org/apache/tuscany/sca/node/launcher/ServiceInvocationTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/test/java/org/apache/tuscany/sca/node/launcher/ServiceInvocationTestCase.java
index b1fe8770b0..b1fe8770b0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/node-launcher/src/test/java/org/apache/tuscany/sca/node/launcher/ServiceInvocationTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/node-launcher/src/test/java/org/apache/tuscany/sca/node/launcher/ServiceInvocationTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/META-INF/MANIFEST.MF
index 1f36921225..1f36921225 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/pom.xml
index e30489ba7b..e30489ba7b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/Logging.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/Logging.java
index 4bed9520ab..4bed9520ab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/Logging.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/Logging.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
index 66a0ba2b51..66a0ba2b51 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingImplementationPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
index 6e1bad67c1..6e1bad67c1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyBuilder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyBuilder.java
index 8a71203b70..8a71203b70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
index b6c83a804a..b6c83a804a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index a79aeb0e28..a79aeb0e28 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
index 62bf06475b..62bf06475b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
index 80867f57de..80867f57de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
index 99f0563603..99f0563603 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingServicePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
index f1fbc54a7a..f1fbc54a7a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 9d0a8fb67f..9d0a8fb67f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index bb7aed2087..bb7aed2087 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index b9bb454550..b9bb454550 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
index 84b7f94e84..84b7f94e84 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/main/resources/org/apache/tuscany/sca/policy/logging/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
index 0000ec8c06..0000ec8c06 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
index 0f1c1f978c..0f1c1f978c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/META-INF/MANIFEST.MF
index 16d54e3fe8..16d54e3fe8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/pom.xml
index 4ba902c135..4ba902c135 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
index c735f63b7d..c735f63b7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
index 3df06c1e00..3df06c1e00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
index 3ab9cb656d..3ab9cb656d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationPrincipal.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
index 2cc24a4974..2cc24a4974 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/token/TokenPrincipal.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
index c970704929..c970704929 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
index 8a65a10560..8a65a10560 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authorization/AuthorizationPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
index 773c874a90..773c874a90 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
index ebbc2ba5ff..ebbc2ba5ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityImplementationPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
index e4c24168c5..e4c24168c5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
index 3c91b9fbcf..3c91b9fbcf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
index 80e1494796..80e1494796 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/identity/SecurityIdentityPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
index d2e0180095..d2e0180095 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/SecurityUtil.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/http/ssl/HTTPSPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/http/ssl/HTTPSPolicy.java
index cef6eebadc..cef6eebadc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/http/ssl/HTTPSPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/http/ssl/HTTPSPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/http/ssl/HTTPSPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/http/ssl/HTTPSPolicyProcessor.java
index b0d6da194c..b0d6da194c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/http/ssl/HTTPSPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/http/ssl/HTTPSPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
index 6425ae7fca..6425ae7fca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationImplementationPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
index 247243fcf8..247243fcf8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index 65d8b5c597..65d8b5c597 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index 16629e4c6b..16629e4c6b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index b9ab68aa2f..b9ab68aa2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
index ab1ab1870f..ab1ab1870f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f402c6f749..f402c6f749 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 6c3579dd2e..6c3579dd2e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 37c5ee9cc0..37c5ee9cc0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
index 21923b3a3b..21923b3a3b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
index 45d4ebaf5e..45d4ebaf5e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/org/apache/tuscany/sca/policy/security/tuscany_definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/policy-security-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
index d41dbc3c70..d41dbc3c70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/main/resources/policy-security-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
index 653f6d621c..653f6d621c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/PolicyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
index 91ab004a7e..91ab004a7e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/mock_policy_definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF
index 6872cb5249..6872cb5249 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/pom.xml
index 0ce2ca3f25..0ce2ca3f25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/GeronimoTransactionManagerHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/GeronimoTransactionManagerHelper.java
index 6ec8b34848..6ec8b34848 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/GeronimoTransactionManagerHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/GeronimoTransactionManagerHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
index 27e777b2c8..27e777b2c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerWrapper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
index 3f43cac8d1..3f43cac8d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 890ac4694b..890ac4694b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.transaction.runtime.TransactionManagerHelper b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.transaction.runtime.TransactionManagerHelper
index 7d88aee19d..7d88aee19d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.transaction.runtime.TransactionManagerHelper
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.transaction.runtime.TransactionManagerHelper
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
index 07ce921ebe..07ce921ebe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime-geronimo/src/test/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionManagerHelperTestCaseOFF.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
index df084390b8..df084390b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/pom.xml
index 3abf73881d..3abf73881d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/IncompatibleIntentException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/IncompatibleIntentException.java
index e3cb6fc359..e3cb6fc359 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/IncompatibleIntentException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/IncompatibleIntentException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
index dc042ed5cc..dc042ed5cc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionImplementationPolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionIntent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionIntent.java
index 196b9cc0a1..196b9cc0a1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionIntent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionIntent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
index f6e0e87ece..f6e0e87ece 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelper.java
index 6d67e51bd7..6d67e51bd7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionManagerHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionPolicyProviderFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionPolicyProviderFactory.java
index 23c25c9b8a..23c25c9b8a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionPolicyProviderFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionPolicyProviderFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java
index 1dc0feb0b5..1dc0feb0b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionReferencePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java
index c2a7c1039b..c2a7c1039b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionServicePolicyProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionalAction.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionalAction.java
index 2785177000..2785177000 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionalAction.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/TransactionalAction.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
index 0b38a71ad4..0b38a71ad4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/META-INF/MANIFEST.MF
index cb6c831909..cb6c831909 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/pom.xml
index d8f60ec4c2..d8f60ec4c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index 12ef603d01..12ef603d01 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyFactory.java
index f0567f47e0..f0567f47e0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
index d6818c9b98..d6818c9b98 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/impl/TransactionPolicyFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/impl/TransactionPolicyFactoryImpl.java
index 6a4325fa4d..6a4325fa4d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/impl/TransactionPolicyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/impl/TransactionPolicyFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/impl/TransactionPolicyImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/impl/TransactionPolicyImpl.java
index 9264dfe5ed..9264dfe5ed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/impl/TransactionPolicyImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/impl/TransactionPolicyImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index bb4a0f85d1..bb4a0f85d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 77114f703d..77114f703d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.transaction.TransactionPolicyFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.transaction.TransactionPolicyFactory
index 5b37ba4171..5b37ba4171 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.transaction.TransactionPolicyFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.transaction.TransactionPolicyFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
index 87668eba1e..87668eba1e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
index fd3e0a7968..fd3e0a7968 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/META-INF/MANIFEST.MF
index 5dcfbd5b14..5dcfbd5b14 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/pom.xml
index b1cae5460b..b1cae5460b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicy.java
index 6938b72d82..6938b72d82 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyBuilder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyBuilder.java
index d6bd710ed9..d6bd710ed9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyBuilder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyBuilder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/xml/WSPolicyProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/xml/WSPolicyProcessor.java
index 48bf932c27..48bf932c27 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/xml/WSPolicyProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/xml/WSPolicyProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
index e161411be3..e161411be3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.PolicyBuilder
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 745ad35871..745ad35871 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TestModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TestModelResolver.java
index 593f56e7f9..593f56e7f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TestModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TestModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TuscanyWSPolicyAssertion.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TuscanyWSPolicyAssertion.java
index 5b4172563a..5b4172563a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TuscanyWSPolicyAssertion.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TuscanyWSPolicyAssertion.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TuscanyWSPolicyAssertionProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TuscanyWSPolicyAssertionProcessor.java
index 065feb012c..065feb012c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TuscanyWSPolicyAssertionProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/TuscanyWSPolicyAssertionProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
index b4c72b5235..b4c72b5235 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/xml/WSPolicyProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/xml/WSPolicyProcessorTestCase.java
index 1c9c9b706a..1c9c9b706a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/xml/WSPolicyProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/xml/WSPolicyProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/resources/org/apache/tuscany/sca/policy/wspolicy/test_definitions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/resources/org/apache/tuscany/sca/policy/wspolicy/test_definitions.xml
index 600ac8e267..600ac8e267 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/policy-wspolicy/src/test/resources/org/apache/tuscany/sca/policy/wspolicy/test_definitions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/policy-wspolicy/src/test/resources/org/apache/tuscany/sca/policy/wspolicy/test_definitions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/pom.xml
index bece50db93..bece50db93 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/LICENSE
index 97b8a2303e..97b8a2303e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/META-INF/MANIFEST.MF
index 4729aa7bc8..4729aa7bc8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/NOTICE
index 8c74c2267e..8c74c2267e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/pom.xml
index f844433a7d..f844433a7d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
index 09faf1b15e..09faf1b15e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ComponentContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
index f32289dcb1..f32289dcb1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/Constants.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/InvalidServiceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/InvalidServiceException.java
index 02c575c05c..02c575c05c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/InvalidServiceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/InvalidServiceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchDomainException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchDomainException.java
index d0f8a3e24d..d0f8a3e24d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchDomainException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchDomainException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchServiceException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchServiceException.java
index 189e713e97..189e713e97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchServiceException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/NoSuchServiceException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
index 162e8e2055..162e8e2055 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/RequestContext.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ResponseDispatch.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ResponseDispatch.java
index fe7f779f5e..fe7f779f5e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ResponseDispatch.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ResponseDispatch.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
index d2d62763fa..d2d62763fa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
index 8ebaa96500..8ebaa96500 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceRuntimeException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
index 355a84a4c3..355a84a4c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/ServiceUnavailableException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
index 3350e9413b..3350e9413b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AllowsPassByReference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AsyncFault.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AsyncFault.java
index 6f36f97bff..6f36f97bff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AsyncFault.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AsyncFault.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AsyncInvocation.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AsyncInvocation.java
index 43233e9747..43233e9747 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AsyncInvocation.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/AsyncInvocation.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
index 2b18388c8b..2b18388c8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authentication.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authorization.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authorization.java
index 6893f6196a..6893f6196a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authorization.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Authorization.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
index cc68baaba9..cc68baaba9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Callback.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
index 5ea768a9ca..5ea768a9ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ComponentName.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
index df5c3c502e..df5c3c502e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Confidentiality.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
index c1c99de683..c1c99de683 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Constructor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
index 90cf9b81ce..90cf9b81ce 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Context.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
index b4d3cd4369..b4d3cd4369 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Destroy.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
index e4cd03ea4b..e4cd03ea4b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/EagerInit.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
index b4b420c175..b4b420c175 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Init.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
index e9918533d9..e9918533d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Integrity.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
index 593ae56e67..593ae56e67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Intent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedSharedTransaction.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedSharedTransaction.java
index ba6b086756..ba6b086756 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedSharedTransaction.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedSharedTransaction.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedTransaction.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedTransaction.java
index 6fca1ab5df..6fca1ab5df 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedTransaction.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/ManagedTransaction.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/MutualAuthentication.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/MutualAuthentication.java
index 9a4bf86053..9a4bf86053 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/MutualAuthentication.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/MutualAuthentication.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/NoManagedTransaction.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/NoManagedTransaction.java
index 5c31fbc99f..5c31fbc99f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/NoManagedTransaction.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/NoManagedTransaction.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
index 1fbf83458e..1fbf83458e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/OneWay.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
index 2f9fe9a098..2f9fe9a098 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/PolicySets.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
index 6a8c8a0e04..6a8c8a0e04 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Property.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
index dd002d27c7..dd002d27c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Qualifier.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
index 4dbf9412fc..4dbf9412fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Reference.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
index 50f3557bed..50f3557bed 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Remotable.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
index b5d485e016..b5d485e016 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Requires.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
index 087f589168..087f589168 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Scope.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
index 5c2600ff12..5c2600ff12 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/Service.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/package.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/package.html
index f81f09ce7a..f81f09ce7a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/package.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/annotation/package.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactory.java
index 9e25d407a5..9e25d407a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactoryFinder.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactoryFinder.java
index 795fe30714..795fe30714 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactoryFinder.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/client/SCAClientFactoryFinder.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinderImpl.java
index 4aa312f6b5..4aa312f6b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/client/impl/SCAClientFactoryFinderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/package.html b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/package.html
index 236fc686a0..236fc686a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-api/src/main/java/org/oasisopen/sca/package.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-api/src/main/java/org/oasisopen/sca/package.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/META-INF/MANIFEST.MF
index e96d9c6c54..e96d9c6c54 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/pom.xml
index 28c45901d6..28c45901d6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java
index 81152cf0a7..81152cf0a7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
index d32afb2acb..d32afb2acb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java
index b1f7b37f8f..b1f7b37f8f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryImpl2.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java
index 4fb38e4ca6..4fb38e4ca6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java
index 64f982796c..64f982796c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientModuleActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java
index c5913070e8..c5913070e8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientProxyHandler.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 97a05b05a4..97a05b05a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory
index bcae8b1296..bcae8b1296 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/sca-client-impl/src/main/resources/META-INF/services/org.oasisopen.sca.client.SCAClientFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/LICENSE
index c77d3fe856..c77d3fe856 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/META-INF/MANIFEST.MF
index f77fd60d0d..f77fd60d0d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/NOTICE
index dfde08644b..dfde08644b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/pom.xml
index 6c521bea14..6c521bea14 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyHelper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyHelper.java
index f4d7f48dae..f4d7f48dae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyHelper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyHelper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptor.java
index 1381266c9e..1381266c9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptorSupport.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptorSupport.java
index 4c73f28a08..4c73f28a08 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptorSupport.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/stripes/src/main/java/org/apache/tuscany/sca/stripes/TuscanyInterceptorSupport.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/META-INF/MANIFEST.MF
index c812e3580d..c812e3580d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/maven-eclipse.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/maven-eclipse.xml
index 4ceebd71f7..4ceebd71f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/maven-eclipse.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/maven-eclipse.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/pom.xml
index c9382cd510..c9382cd510 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
index 2836e90e19..2836e90e19 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
index 83a06a771e..83a06a771e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
index 8bde1d4f91..8bde1d4f91 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TimingAspect.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
index 0178ebdb6e..0178ebdb6e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java
index a60bd0f883..a60bd0f883 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/UserTimingAspect.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
index b7f629ff4f..b7f629ff4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
index 7b76faaf36..7b76faaf36 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/tracing-aspectj/src/test/java/org/apache/tuscany/sca/aspectj/TracingTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/LICENSE
index 422e5f7033..422e5f7033 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/META-INF/MANIFEST.MF
index 11eca78a2c..11eca78a2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/NOTICE
index 55cb8b86a8..55cb8b86a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/build-dojo.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/build-dojo.xml
index 3a0c0fd87f..3a0c0fd87f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/build-dojo.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/build-dojo.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/pom.xml
index 5a3cdb46be..5a3cdb46be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
index dad72be5f2..dad72be5f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoResourceServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java
index e69c2488ec..e69c2488ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoWidgetJavascriptProvider.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider
index 70d29a5d86..70d29a5d86 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.widget.javascript.WidgetImplementationJavascriptProvider
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js
index 7b8943ba3b..7b8943ba3b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript-dojo/src/main/resources/tuscany/AtomService.js
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/META-INF/MANIFEST.MF
index 1bb885ab2c..1bb885ab2c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/pom.xml
index dedfff0be8..dedfff0be8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java
index d0576b4468..d0576b4468 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGenerator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java
index ed42ce0e47..ed42ce0e47 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/ComponentJavaScriptGeneratorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
index 55326b539e..55326b539e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultComponentJavaScriptGeneratorExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
index 402eb53bb0..402eb53bb0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/DefaultJavascriptProxyFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java
index fda093d9aa..fda093d9aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java
index 5856c15a9b..5856c15a9b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/java/org/apache/tuscany/sca/web/javascript/JavascriptProxyFactoryExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint
index 6a28e3481d..6a28e3481d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.ComponentJavaScriptGeneratorExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint
index 95a7cecd2b..95a7cecd2b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/resources/META-INF/services/org.apache.tuscany.sca.web.javascript.JavascriptProxyFactoryExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties
index dbc7317653..dbc7317653 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/web-javascript/src/main/resources/web-javascript-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/wink/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/LICENSE
index c77d3fe856..c77d3fe856 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/wink/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/wink/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/META-INF/MANIFEST.MF
index 3e6c92d183..3e6c92d183 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/wink/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/wink/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/NOTICE
index dfde08644b..dfde08644b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/wink/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/wink/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/pom.xml
index ecfe275f7f..ecfe275f7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/wink/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
index b0dfb0c100..b0dfb0c100 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/PropertyInjectable.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
index 1cb0d0c2f2..1cb0d0c2f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/ReferenceInjectable.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
index 8aef24fa40..8aef24fa40 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyDeploymentConfiguration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
index 3410ecd804..3410ecd804 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/wink/src/main/java/org/apache/tuscany/sca/wink/TuscanyInjectableFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/META-INF/MANIFEST.MF
index 6d697353b6..6d697353b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/pom.xml
index c7bdcd4443..c7bdcd4443 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
index 92dce98fa1..92dce98fa1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/DefaultXSDFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
index d57d462843..d57d462843 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDFactory.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
index f7ddd25611..f7ddd25611 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/XSDefinition.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
index 60ff6b6fd9..60ff6b6fd9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
index af8cbf12ab..af8cbf12ab 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/impl/XSDefinitionImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
index 1166567bcc..1166567bcc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
index d87f1a3ef1..d87f1a3ef1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDModelResolver.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 8431cdcb75..8431cdcb75 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index acae484065..acae484065 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
index d51b2445a4..d51b2445a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.xsd.XSDFactory
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties
index ab50456510..ab50456510 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/main/resources/xsd-xml-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
index e139625986..e139625986 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/test/resources/xsd/greeting.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/test/resources/xsd/greeting.xsd
index 635ca25bfc..635ca25bfc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/test/resources/xsd/greeting.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/test/resources/xsd/greeting.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/test/resources/xsd/name.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/test/resources/xsd/name.xsd
index 300de931ec..300de931ec 100644
--- a/sca-java-2.x/tags/2.0-M5.1/modules/xsd/src/test/resources/xsd/name.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/modules/xsd/src/test/resources/xsd/name.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/pom.xml
index b295db6d7f..b295db6d7f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/README
index 43b7cb3056..43b7cb3056 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/README
index 2f169419ba..2f169419ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/build.xml
index fe28a46b7c..fe28a46b7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/pom.xml
index 1507ead9db..1507ead9db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
index 0f7dec116f..0f7dec116f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
index 7455dc7d38..7455dc7d38 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
index 39d4b2fd28..39d4b2fd28 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
index d8ded42cb2..d8ded42cb2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/README
index cb25027f14..cb25027f14 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/build.xml
index 888a1c88b7..888a1c88b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/pom.xml
index d5f17751f9..d5f17751f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
index a235e648c7..a235e648c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
index 8b6fe066a6..8b6fe066a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
index 2b99485b68..2b99485b68 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
index 3c0375924f..3c0375924f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
index bcfd8871b6..bcfd8871b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
index 497dafd4fd..497dafd4fd 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
index f7ac0b7287..f7ac0b7287 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
index b7dca792b2..b7dca792b2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
index 376b3e5bb9..376b3e5bb9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
index 77b128ab8d..77b128ab8d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
index 8b37d407f0..8b37d407f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/resources/CalculatorRMIServer.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
index 0e352db9bb..0e352db9bb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/contribution-calculator-service/src/test/java/calculator/CalculatorRMIServerTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/pom.xml
index 4f9deb7ce3..4f9deb7ce3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-rmi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-rmi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/README
index 18ba62d494..18ba62d494 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/README
index 4777c5ad88..4777c5ad88 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/build.xml
index c109d89c75..c109d89c75 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/pom.xml
index c6933b758a..c6933b758a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
index bb75bb2337..bb75bb2337 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index fc53393d23..fc53393d23 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
index b1250ed9f2..b1250ed9f2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 11f68c66e3..11f68c66e3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 30e59bf668..30e59bf668 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
index 3e64787ce4..3e64787ce4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/contribution-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/pom.xml
index 6ba062df21..6ba062df21 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/binding-sca/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/binding-sca/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/META-INF/MANIFEST.MF
index 1ebd35b30a..1ebd35b30a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/README
index c416ad96a0..c416ad96a0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/build.xml
index 46522211f9..46522211f9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/pom.xml
index ebf5123e27..ebf5123e27 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
index 4408568629..4408568629 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
index afd5ea48fc..afd5ea48fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
index 39f55ca31f..39f55ca31f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/resources/Calculator.composite
index c5e636f769..c5e636f769 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
index d6a3ccb24e..d6a3ccb24e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-osgi/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-scaclient/README
index 97058ca4c9..97058ca4c9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-scaclient/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-scaclient/pom.xml
index 66f3fac716..66f3fac716 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-scaclient/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-scaclient/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-scaclient/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
index edbf528517..edbf528517 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/README
index 14636d090e..14636d090e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/build.xml
index b0401d755e..b0401d755e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.odg b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/calculator.odg
index c2646f7d5e..c2646f7d5e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.odg
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/calculator.odg
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.png b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/calculator.png
index 476306e5f0..476306e5f0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/calculator.png
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/calculator.png
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/pom.xml
index 64b718729d..64b718729d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java
index dd7ecb827d..dd7ecb827d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite
index ac4d7321e7..ac4d7321e7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
index 8d6012e5c4..8d6012e5c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
index 9d3024f451..9d3024f451 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/README
index acf18ec8d9..acf18ec8d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/build.xml
index c4b53cc9cf..c4b53cc9cf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/pom.xml
index 22853a4b1f..22853a4b1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
index 84c98d7f70..84c98d7f70 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java
index ce1cdaae5a..ce1cdaae5a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
index 17fad7de6b..17fad7de6b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
index 05bea57944..05bea57944 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
index dfd32761be..dfd32761be 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
index 70aab0e051..70aab0e051 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
index 2e4a700156..2e4a700156 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
index 82a803e3a6..82a803e3a6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
index fced5b7840..fced5b7840 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
index c7250912b0..c7250912b0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/README
index 57126842a4..57126842a4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/pom.xml
index df36ab1ae4..df36ab1ae4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index da2ce9063a..da2ce9063a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
index d24999ab3e..d24999ab3e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index 49c5aab041..49c5aab041 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/META-INF/MANIFEST.MF
index 542b53b085..542b53b085 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
index 1dff21ab6b..1dff21ab6b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
index c64e999fc6..c64e999fc6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/README
index e2cf7cd522..e2cf7cd522 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/pom.xml
index c878465a26..c878465a26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6b42645f69..6b42645f69 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index a9ea37585a..a9ea37585a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
index b48c048000..b48c048000 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 2f37da0707..2f37da0707 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
index cea4e2ff79..cea4e2ff79 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
index 99845257ff..99845257ff 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
index f6b5f4690e..f6b5f4690e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
index 322d4daf2f..322d4daf2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
index b9ca777bd8..b9ca777bd8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
index 1965b571a9..1965b571a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
index 1472f5a976..1472f5a976 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/README
index 77a4cbae9e..77a4cbae9e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/pom.xml
index 9dabe88970..9dabe88970 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
index 66b2977241..66b2977241 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
index a3c21b2b96..a3c21b2b96 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
index 7922d2d392..7922d2d392 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
index f75cc6444e..f75cc6444e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
index 4bbe83b14f..4bbe83b14f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
index cd92989da1..cd92989da1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
index 02007c385c..02007c385c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
index eee64bf86f..eee64bf86f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
index 6ce24a4a32..6ce24a4a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/NOTICE
index 9ddba06a32..9ddba06a32 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
index fd834e12ef..fd834e12ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
index 5daaa59aae..5daaa59aae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
index ded82797b5..ded82797b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
index f10b577e87..f10b577e87 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/README
index e8d311298e..e8d311298e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/dosgi-calculator.png b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
index 805baa54d2..805baa54d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/dosgi-calculator.png
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/pom.xml
index 5232d65f03..5232d65f03 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
index cc562b7c2f..cc562b7c2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
index 6228afcd53..6228afcd53 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
index 5f9db16ca9..5f9db16ca9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
index aa09b27139..aa09b27139 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
index 971500782f..971500782f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
index 49b8a1c0bf..49b8a1c0bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
index f4e59d12ea..f4e59d12ea 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
index bfb9b820f7..bfb9b820f7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
index a4fc52694e..a4fc52694e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
index a813dfb6f3..a813dfb6f3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
index 955e386ad8..955e386ad8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
index 565a314d85..565a314d85 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
index 4015c7bbc2..4015c7bbc2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
index 99e0da9f97..99e0da9f97 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/README
index 533743ebf6..533743ebf6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/build.xml
index 008953e63b..008953e63b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.png b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/helloworld-bpel.png
index 5f53a3c5d1..5f53a3c5d1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.png
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/helloworld-bpel.png
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.svg b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/helloworld-bpel.svg
index 5a98f1a07c..5a98f1a07c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/helloworld-bpel.svg
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/helloworld-bpel.svg
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/pom.xml
index c06b033e17..c06b033e17 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
index dbd3854d7c..dbd3854d7c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/java/helloworld/Hello.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
index 4a56523adb..4a56523adb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
index d58768adfa..d58768adfa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/helloworld.composite
index 08350e8417..08350e8417 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
index cf966264ef..cf966264ef 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/log4j.properties
index 8649a71550..8649a71550 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-bpel/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-bpel/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-scaclient/pom.xml
index f29a86a9a9..f29a86a9a9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-scaclient/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-scaclient/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-scaclient/src/main/java/sample/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
index c2c9c4e44e..c2c9c4e44e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
index 13e08de692..13e08de692 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/pom.xml
index 05b43c67d8..05b43c67d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/java/sample/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/java/sample/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java
index ac03ea3ca6..ac03ea3ca6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml
index 552d100638..552d100638 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld-context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/resources/helloworld-context.xml
index 89b2cfb6f5..89b2cfb6f5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld-context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/resources/helloworld-context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/resources/helloworld.composite
index 33895dde25..33895dde25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
index 7e679ec0e9..7e679ec0e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/README
index be947b1923..be947b1923 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/build.xml
index 401315d424..401315d424 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
index bd2bba41db..bd2bba41db 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/maven-eclipse.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/maven-eclipse.xml
index 3adfca89f4..3adfca89f4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/maven-eclipse.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/maven-eclipse.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/pom.xml
index 1dbe48716f..1dbe48716f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
index ebc270811f..ebc270811f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
index c42a4d59c3..c42a4d59c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
index ff5cb4ceda..ff5cb4ceda 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
index fa257a0605..fa257a0605 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
index 711eef63b5..711eef63b5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
index d222d77b3b..d222d77b3b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
index a988a4156c..a988a4156c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
index b609f58373..b609f58373 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
index f8b2a60f6a..f8b2a60f6a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
index 46c819d08c..46c819d08c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
index 65b0e294a8..65b0e294a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
index 3dca310cdb..3dca310cdb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/logging.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
index 0451cee24c..0451cee24c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/test.xsd b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/test.xsd
index 7fd9aa0013..7fd9aa0013 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/test.xsd
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/test.xsd
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
index 882819110f..882819110f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
index 3918f9a4a5..3918f9a4a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
index 98487ad88b..98487ad88b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
index b6b4ed2254..b6b4ed2254 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld-ws-sdo/src/test/java/helloworld/TestCaseRunner.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/README
index ed0f1d0ce4..ed0f1d0ce4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/pom.xml
index b3b0fc3e14..b3b0fc3e14 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/java/sample/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/main/java/sample/Helloworld.java
index f4e8c50448..f4e8c50448 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/java/sample/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/main/java/sample/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/main/java/sample/HelloworldImpl.java
index 5bf6a94505..5bf6a94505 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/java/sample/HelloworldImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/main/java/sample/HelloworldImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml
index 91b0c8fa6f..91b0c8fa6f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/main/resources/helloworld.composite
index 324395c246..324395c246 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/main/resources/helloworld.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/main/resources/helloworld.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/test/java/sample/HelloworldTestCase.java
index 7e679ec0e9..7e679ec0e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/helloworld/src/test/java/sample/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/helloworld/src/test/java/sample/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-command-line/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-command-line/README
index bf963ea98e..bf963ea98e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-command-line/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-command-line/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/README
index 359e5d134d..359e5d134d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/build.xml
index 89987056d2..89987056d2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/pom.xml
index 16274169d8..16274169d8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
index fdff16c12c..fdff16c12c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
index 9a4a73c556..9a4a73c556 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/main/java/launcher/SampleJSELauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
index f2ed3d421d..f2ed3d421d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
index 3c2acbcc46..3c2acbcc46 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/README
index 01d277ae09..01d277ae09 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/build.xml
index f08d19e472..f08d19e472 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/pom.xml
index 7ed4af1267..7ed4af1267 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
index f4a2f0780c..f4a2f0780c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
index e506f982de..e506f982de 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
index f2ed3d421d..f2ed3d421d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
index 7b72ec7aee..7b72ec7aee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-maven/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-maven/README
index ff976c3515..ff976c3515 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/launcher-maven/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/launcher-maven/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/logging.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/logging.properties
index cf452e7812..cf452e7812 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/logging.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/logging.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/pom.xml
index ee8cd25fcb..ee8cd25fcb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/README
index 46e71bf51e..46e71bf51e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/pom.xml
index 41448c6547..41448c6547 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Cart.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Cart.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/Cart.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Catalog.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/Catalog.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/CurrencyConverter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/CurrencyConverterImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/FruitsCatalogImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Item.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/Item.java
index 27abd4f016..27abd4f016 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Item.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/Item.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/ShoppingCartImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Total.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/java/services/Total.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/java/services/Total.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/resources/store.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/resources/store.composite
index 7a07b89903..7a07b89903 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/resources/store.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/resources/store.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
index cdda6bbcad..cdda6bbcad 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
index b353a6e759..b353a6e759 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
index bf3fe972ca..bf3fe972ca 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/store.html b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/webapp/store.html
index 7fa2e07d5a..7fa2e07d5a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/src/main/webapp/store.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/src/main/webapp/store.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/store.png b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/store.png
index da413edeee..da413edeee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/store.png
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/store.png
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/store.svg b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store-webapp/store.svg
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store-webapp/store.svg
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/README
index d31e4c59b7..d31e4c59b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/build.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/build.xml
index bd36a0d398..bd36a0d398 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/build.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/build.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/pom.xml
index 9a39199fbe..9a39199fbe 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/launch/Launch.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/launch/Launch.java
index 8e4b5839e4..8e4b5839e4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/launch/Launch.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/launch/Launch.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Cart.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/Cart.java
index 3fb5439bc3..3fb5439bc3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Cart.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/Cart.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Catalog.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/Catalog.java
index b5e504fe11..b5e504fe11 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Catalog.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/Catalog.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/CurrencyConverter.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/CurrencyConverter.java
index a064f3dd69..a064f3dd69 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/CurrencyConverter.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/CurrencyConverter.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/CurrencyConverterImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/CurrencyConverterImpl.java
index c354aed447..c354aed447 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/CurrencyConverterImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/CurrencyConverterImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/FruitsCatalogImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/FruitsCatalogImpl.java
index d132a24b00..d132a24b00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/FruitsCatalogImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/FruitsCatalogImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Item.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/Item.java
index fe32cfc828..fe32cfc828 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Item.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/Item.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/ShoppingCartImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/ShoppingCartImpl.java
index 698614212d..698614212d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/ShoppingCartImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/ShoppingCartImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Total.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/Total.java
index b77cc1c7ac..b77cc1c7ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/java/services/Total.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/java/services/Total.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/resources/store.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/resources/store.composite
index 9c3b79c508..9c3b79c508 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/resources/store.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/resources/store.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/resources/uiservices/store.html b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/resources/uiservices/store.html
index 000f1f891f..000f1f891f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/main/resources/uiservices/store.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/main/resources/uiservices/store.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/client/Shopper.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/test/java/client/Shopper.java
index 4e2fa63493..4e2fa63493 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/client/Shopper.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/test/java/client/Shopper.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/client/ShopperImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/test/java/client/ShopperImpl.java
index 05b1800d4f..05b1800d4f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/client/ShopperImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/test/java/client/ShopperImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/store/StoreTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/test/java/store/StoreTestCase.java
index 883aaa76f6..883aaa76f6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/java/store/StoreTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/test/java/store/StoreTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/resources/store-client.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/test/resources/store-client.composite
index c9abe8e996..c9abe8e996 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/src/test/resources/store-client.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/src/test/resources/store-client.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/store.png b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/store.png
index da413edeee..da413edeee 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/store.png
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/store.png
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/store/store.svg b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/store.svg
index 74f8ecd36d..74f8ecd36d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/store/store.svg
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/store/store.svg
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/pom.xml
index 5fddd14270..5fddd14270 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
index c1a50d9be5..c1a50d9be5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
index f1e8895f76..f1e8895f76 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.bpel
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/resources/helloworld.wsdl
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
index 3d36adadeb..3d36adadeb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
index bf01a7b759..bf01a7b759 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
index c52d7b1cb2..c52d7b1cb2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-bpel/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/pom.xml
index 7b96841b3b..7b96841b3b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
index 42625b8a78..42625b8a78 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application
index 8ce781d6c8..8ce781d6c8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/application
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
index 7ff71519e9..7ff71519e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
index 3c5726a818..3c5726a818 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
index ffe5dd3b2b..ffe5dd3b2b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/README
index 88bbe9adcb..88bbe9adcb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/pom.xml
index a97551ae8b..a97551ae8b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
index f209f11605..f209f11605 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldClient.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
index df2a852161..df2a852161 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
index c09af51e23..c09af51e23 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/java/sample/HelloWorldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
index 7575edfc29..7575edfc29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/META-INF/context.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
index a8cd27f6c6..a8cd27f6c6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/jetty-env.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
index c51985bc30..c51985bc30 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
index 86710435ae..86710435ae 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
index 9ae037f2c2..9ae037f2c2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jms/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/pom.xml
index 63a00a64a8..63a00a64a8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
index 123774b936..123774b936 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
index 66cef71a25..66cef71a25 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
index d41a8535e2..d41a8535e2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
index babeb7b203..babeb7b203 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
index 12024cc4d3..12024cc4d3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
index 099b442050..099b442050 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/pom.xml
index bc2b59f7d4..bc2b59f7d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
index 9c9f541997..9c9f541997 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloWorldController.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
index 23925d6c69..23925d6c69 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
index 99cee9faeb..99cee9faeb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
index fecbd7c79b..fecbd7c79b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
index 189c142c99..189c142c99 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/helloWorld.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
index 5ca296e115..5ca296e115 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/index.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
index 89259021c7..89259021c7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsf/src/main/webapp/page2.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/pom.xml
index 42110cf72d..42110cf72d 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
index fa1f7ad7b9..fa1f7ad7b9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
index ffd01cca73..ffd01cca73 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/main/webapp/hello.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
index 665957b0eb..665957b0eb 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/pom.xml
index b59d4861b8..b59d4861b8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
index 2e43e09897..2e43e09897 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
index 9e79276704..9e79276704 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
index bb72c50f6a..bb72c50f6a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
index a91b3fc96b..a91b3fc96b 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
index c4484916aa..c4484916aa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/main/webapp/hello.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
index 61d722da1f..61d722da1f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/pom.xml
index 7a9231ea67..7a9231ea67 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
index 0ab02682ac..0ab02682ac 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
index 0385c92369..0385c92369 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
index 53ff7a5ca1..53ff7a5ca1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldService.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
index a22c095f29..a22c095f29 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
index 902842a19e..902842a19e 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/resources/StripesResources.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
index 2741999098..2741999098 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/resources/log4j.properties
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
index 0681c1f2bf..0681c1f2bf 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
index d0fb716b80..d0fb716b80 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
index f85602fcfa..f85602fcfa 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
index 8976adde3c..8976adde3c 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.composite
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
index f01584cc2f..f01584cc2f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
index c79d29e6a5..c79d29e6a5 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/main/webapp/index.html
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/test/java/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/test/java/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
index 7f4359fa43..7f4359fa43 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/README b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/README
index 828aadb0f1..828aadb0f1 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/README
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/README
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/pom.xml
index 1226b769b7..1226b769b7 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
index 85aed34b26..85aed34b26 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/Helloworld.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/src/test/java/itest/Helloworld.java
index f1ccf0b1ba..f1ccf0b1ba 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/Helloworld.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/src/test/java/itest/Helloworld.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java
index c1c2c6aae0..c1c2c6aae0 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/src/test/java/itest/HelloworldTestCaseFIXME.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/resources/test-web.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/src/test/resources/test-web.xml
index a68aa28698..a68aa28698 100644
--- a/sca-java-2.x/tags/2.0-M5.1/samples/webapps/helloworld/src/test/resources/test-web.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/samples/webapps/helloworld/src/test/resources/test-web.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/pom.xml
index 947bf4e4d4..947bf4e4d4 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/java/org/apache/tuscany/sca/base/AggregatedBundleActivator.java b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/java/org/apache/tuscany/sca/base/AggregatedBundleActivator.java
index cb35fed680..cb35fed680 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/java/org/apache/tuscany/sca/base/AggregatedBundleActivator.java
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/java/org/apache/tuscany/sca/base/AggregatedBundleActivator.java
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/resources/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/resources/LICENSE
index 69a1a5eee6..69a1a5eee6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/resources/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/resources/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/resources/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/resources/META-INF/MANIFEST.MF
index c36a4409b2..c36a4409b2 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/resources/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/resources/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/resources/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/resources/NOTICE
index 1bfb4e16c3..1bfb4e16c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/resources/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/resources/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/resources/README.txt b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/resources/README.txt
index 3de5be9155..3de5be9155 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base-nodep/src/main/resources/README.txt
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base-nodep/src/main/resources/README.txt
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base/pom.xml
index f428f4ee00..f428f4ee00 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base/src/main/resources/LICENSE b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base/src/main/resources/LICENSE
index 69a1a5eee6..69a1a5eee6 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base/src/main/resources/LICENSE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base/src/main/resources/LICENSE
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base/src/main/resources/NOTICE b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base/src/main/resources/NOTICE
index 1bfb4e16c3..1bfb4e16c3 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base/src/main/resources/NOTICE
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base/src/main/resources/NOTICE
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/base/src/main/resources/README.txt b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base/src/main/resources/README.txt
index d8be6ae636..d8be6ae636 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/base/src/main/resources/README.txt
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/base/src/main/resources/README.txt
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/bpel-nodep/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/bpel-nodep/pom.xml
index 1edf7970e9..1edf7970e9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/bpel-nodep/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/bpel-nodep/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/bpel/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/bpel/pom.xml
index 2a31cc30fc..2a31cc30fc 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/bpel/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/bpel/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/jms-nodep/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/jms-nodep/pom.xml
index b134a4a573..b134a4a573 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/jms-nodep/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/jms-nodep/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/jms/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/jms/pom.xml
index 837a036a49..837a036a49 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/jms/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/jms/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/json-nodep/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/json-nodep/pom.xml
index 2639edae37..2639edae37 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/json-nodep/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/json-nodep/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/json/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/json/pom.xml
index 2c2fd1b52f..2c2fd1b52f 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/json/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/json/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/pom.xml
index 881a87d5d9..881a87d5d9 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/spring-nodep/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/spring-nodep/pom.xml
index 02c2a4413a..02c2a4413a 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/spring-nodep/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/spring-nodep/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/spring/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/spring/pom.xml
index 2a8160f969..2a8160f969 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/spring/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/spring/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/webservices-nodep/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/webservices-nodep/pom.xml
index eb64ce0782..eb64ce0782 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/webservices-nodep/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/webservices-nodep/pom.xml
diff --git a/sca-java-2.x/tags/2.0-M5.1/shades/webservices/pom.xml b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/webservices/pom.xml
index 59c9428fa8..59c9428fa8 100644
--- a/sca-java-2.x/tags/2.0-M5.1/shades/webservices/pom.xml
+++ b/sca-java-2.x/tags/2.0-M5.1-RC1/shades/webservices/pom.xml